mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 15:21:51 +00:00
- r1279's fix was not correct.
SVN r1282 (trunk)
This commit is contained in:
parent
edeed7673a
commit
b5e085e562
1 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue