zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- r1279's fix was not correct.

Browse source 
SVN r1282 (trunk)
This commit is contained in:
Christoph Oelckers 2008-10-28 22:53:43 +00:00
parent edeed7673a
commit b5e085e562
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_expression.cpp
View file

@ -2764,7 +2764,7 @@ void FStateExpressions::Copy(int dest, int src, int cnt)
for(int i=0; i<cnt; i++) for(int i=0; i<cnt; i++)
{ {
// For now set only a reference because these expressions may change when being resolved // 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; expressions[dest+i].cloned = true;
} }
} }
@ -2786,7 +2786,7 @@ int FStateExpressions::ResolveAll()
if (expressions[i].cloned) if (expressions[i].cloned)
{ {
// Now that everything coming before has been resolved we may copy the actual pointer. // 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; expressions[i].expr = expressions[ii].expr;
} }
else if (expressions[i].expr != NULL) else if (expressions[i].expr != NULL)