zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: AActor::SetState must restore the 'state' member to the actual calling state after it detected OF_StateChanged.

Browse source 
This is needed to decide how the '####' and '----' placeholders should behave.
This commit is contained in:
Christoph Oelckers 2016-02-10 18:13:20 +01:00
parent d18a839836
commit 1c0cd16d3f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.cpp
View file

@ -620,7 +620,9 @@ bool AActor::SetState (FState *newstate, bool nofunction)
if (ObjectFlags & OF_StateChanged) if (ObjectFlags & OF_StateChanged)
{ // The action was an A_Jump-style function that wants to change the next state. { // The action was an A_Jump-style function that wants to change the next state.
ObjectFlags &= ~OF_StateChanged; ObjectFlags &= ~OF_StateChanged;
FState *saved = newstate;
newstate = state; newstate = state;
state = saved; // we need this for comparison of sprites.
tics = 0; // make sure we loop and set the new state properly tics = 0; // make sure we loop and set the new state properly
continue; continue;
} }