zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SVN r312 (trunk)

This commit is contained in:
Christoph Oelckers 2006-08-27 08:51:01 +00:00
parent 1b879c61c2
commit 38f650f7c5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/rh-log.txt
View File

@ -1,3 +1,6 @@
August 27, 2006 (Changes by Graf Zahl)
- fixed: callstatechain didn`t check for NULL code pointers
August 25, 2006
- Fixed: Multiple-choice sound sequences could not be assigned IDs for use
with polyobjects and the sound sequence selector things.

11
src/thingdef_codeptr.cpp
View File

@ -109,12 +109,15 @@ bool ACustomInventory::CallStateChain (AActor *actor, FState * State)
while (State != NULL)
{
// Assume success. The code pointer will set this to false if necessary
StateCall.Result = true;
CallingState = StateCall.State = State;
State->GetAction() (actor);
if (State->GetAction() != NULL)
{
StateCall.Result = true;
State->GetAction() (actor);
// collect all the results. Even one successful call signifies overall success.
result |= StateCall.Result;
}
// collect all the results. Even one successful call signifies overall success.
result |= StateCall.Result;
// Since there are no delays it is a good idea to check for infinite loops here!
counter++;