From 1895feb185cb2156a620de4a86004e456feb1026 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@users.noreply.github.com>
Date: Wed, 30 Nov 2016 19:22:56 +0100
Subject: [PATCH] - fixed two apparently bogus asserts with returning gloating
 point constants.

---
 src/scripting/vm/vmexec.h    | 4 ++--
 src/scripting/vm/vmframe.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scripting/vm/vmexec.h b/src/scripting/vm/vmexec.h
index 225c73cab..f5e61b5b9 100644
--- a/src/scripting/vm/vmexec.h
+++ b/src/scripting/vm/vmexec.h
@@ -1827,12 +1827,12 @@ static void SetReturn(const VMRegisters &reg, VMFrame *frame, VMReturn *ret, VM_
 	case REGT_FLOAT:
 		if (regtype & REGT_KONST)
 		{
-			assert(regnum + ((regtype & REGT_KONST) ? 2u : 0u) < func->NumKonstF);
+			assert(regnum < func->NumKonstF);
 			src = &func->KonstF[regnum];
 		}
 		else
 		{
-			assert(regnum + ((regtype & REGT_KONST) ? 2u : 0u) < frame->NumRegF);
+			assert(regnum < frame->NumRegF);
 			src = &reg.f[regnum];
 		}
 		if (regtype & REGT_MULTIREG3)
diff --git a/src/scripting/vm/vmframe.cpp b/src/scripting/vm/vmframe.cpp
index d3ce5d5f9..871a46673 100644
--- a/src/scripting/vm/vmframe.cpp
+++ b/src/scripting/vm/vmframe.cpp
@@ -422,7 +422,7 @@ VMFrame *VMFrameStack::PopFrame()
 
 int VMFrameStack::Call(VMFunction *func, VMValue *params, int numparams, VMReturn *results, int numresults, VMException **trap)
 {
-	assert(this == VMGlobalStack);	// why would anyone even want to create a local stack?
+	assert(this == &GlobalVMStack);	// why would anyone even want to create a local stack?
 	bool allocated = false;
 	try
 	{