From b5e085e56214fe268de627fc9482bf4d24c76b62 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 28 Oct 2008 22:53:43 +0000
Subject: [PATCH] - r1279's fix was not correct.

SVN r1282 (trunk)
---
 src/thingdef/thingdef_expression.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/thingdef/thingdef_expression.cpp b/src/thingdef/thingdef_expression.cpp
index e199faa5a..b3258353f 100644
--- a/src/thingdef/thingdef_expression.cpp
+++ b/src/thingdef/thingdef_expression.cpp
@@ -2764,7 +2764,7 @@ void FStateExpressions::Copy(int dest, int src, int cnt)
 	for(int i=0; i<cnt; i++)
 	{
 		// For now set only a reference because these expressions may change when being resolved
-		expressions[dest+i].expr = (FxExpression*)(src+i);
+		expressions[dest+i].expr = (FxExpression*)intptr_t(src+i);
 		expressions[dest+i].cloned = true;
 	}
 }
@@ -2786,7 +2786,7 @@ int FStateExpressions::ResolveAll()
 		if (expressions[i].cloned)
 		{
 			// Now that everything coming before has been resolved we may copy the actual pointer.
-			intptr_t ii = ((intptr_t)expressions[i].expr)-1;
+			intptr_t ii = ((intptr_t)expressions[i].expr);
 			expressions[i].expr = expressions[ii].expr;
 		}
 		else if (expressions[i].expr != NULL)