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

Adjusted the assert conditions in DoJump()

Browse source 
- With multiple A_Jump calls possible in a single action now, it is now
  possible for DoJump() to be called with a callingstate that does not
  match self->state because the state had been changed by a prior A_Jump
  in the same action function.
This commit is contained in:
Randy Heit 2016-02-04 20:36:39 -06:00
parent 9d77244b3f
commit 2516b8f8af
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -676,7 +676,7 @@ static void DoJump(AActor *self, AActor *stateowner, FState *callingstate, FStat
{ {
P_SetPsprite(self->player, ps_flash, jumpto); P_SetPsprite(self->player, ps_flash, jumpto);
} }
else if (callingstate == self->state) else if (callingstate == self->state || (self->ObjectFlags & OF_StateChanged))
{ {
// Rather than using self->SetState(jumpto) to set the state, // Rather than using self->SetState(jumpto) to set the state,
// set the state directly. Since this function is only called by // set the state directly. Since this function is only called by