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

Removed the INSTATECALL flag because it is now unused and was replaced by stateinfo

Browse source
This commit is contained in:
Leonard2 2016-06-17 09:19:30 +02:00
parent 05fabbe294
commit abc7113e09
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/actor.h
View file

@ -283,7 +283,7 @@ enum ActorFlag4
enum ActorFlag5 enum ActorFlag5
{ {
MF5_DONTDRAIN = 0x00000001, // cannot be drained health from. MF5_DONTDRAIN = 0x00000001, // cannot be drained health from.
MF5_INSTATECALL = 0x00000002, // This actor is being run through CallStateChain /* FREE SLOT 0x00000002*/
MF5_NODROPOFF = 0x00000004, // cannot drop off under any circumstances. MF5_NODROPOFF = 0x00000004, // cannot drop off under any circumstances.
MF5_NOFORWARDFALL = 0x00000008, // Does not make any actor fall forward by being damaged by this MF5_NOFORWARDFALL = 0x00000008, // Does not make any actor fall forward by being damaged by this
MF5_COUNTSECRET = 0x00000010, // From Doom 64: actor acts like a secret MF5_COUNTSECRET = 0x00000010, // From Doom 64: actor acts like a secret

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -120,7 +120,6 @@ bool ACustomInventory::CallStateChain (AActor *actor, FState *state)
ret[0].PointerAt((void **)&nextstate); ret[0].PointerAt((void **)&nextstate);
ret[1].IntAt(&retval); ret[1].IntAt(&retval);
this->flags5 |= MF5_INSTATECALL;
FState *savedstate = this->state; FState *savedstate = this->state;
while (state != NULL) while (state != NULL)
@ -191,7 +190,6 @@ bool ACustomInventory::CallStateChain (AActor *actor, FState *state)
} }
state = nextstate; state = nextstate;
} }
this->flags5 &= ~MF5_INSTATECALL;
this->state = savedstate; this->state = savedstate;
return !!result; return !!result;
} }