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

- fixed state checking in A_Teleport.

This commit is contained in:
Christoph Oelckers 2014-12-20 14:48:22 +01:00
parent 48b65f3c76
commit 2a53ebb6b9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/thingdef/thingdef_codeptr.cpp
View File

@ -4246,17 +4246,16 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
if (!(Flags & TF_NOJUMP))
{
ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!
if (TeleportState == NULL)
{
ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!
// Default to Teleport.
TeleportState = self->FindState("Teleport");
// If still nothing, then return.
if (!TeleportState) return;
ACTION_JUMP(TeleportState);
return;
}
ACTION_JUMP(TeleportState);
return;
}
}
ACTION_SET_RESULT(teleResult);