OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: CallStateChain must never allow a jumping function to set the chain's overall result to successful.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-04 15:11:20 +01:00
commit caf2ca0df7
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/thingdef/thingdef_codeptr.cpp
View file

@ -146,6 +146,7 @@ bool ACustomInventory::CallStateChain (AActor *actor, FState *state)
if (proto->ReturnTypes[0] == TypeState)
{ // Function returns a state
wantret = &ret[0];
retval = false; // this is a jump function which never affects the success state.
}
else if (proto->ReturnTypes[0] == TypeSInt32 || proto->ReturnTypes[0] == TypeBool)
{ // Function returns an int or bool