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

- fixed some overlooked merging problem.

This commit is contained in:
Christoph Oelckers 2015-05-02 23:44:54 +02:00
parent 99fc685a01
commit 6996a15235
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/thingdef/thingdef_codeptr.cpp
View File

@ -4597,11 +4597,10 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
ACTION_SET_RESULT(false); ACTION_SET_RESULT(false);
if (!ref) if (!ref)
{ {
ACTION_SET_RESULT(false);
return numret; return numret;
} }
if ((ref->flags2 & MF2_NOTELEPORT) && !(Flags & TF_OVERRIDE)) if ((ref->flags2 & MF2_NOTELEPORT) && !(flags & TF_OVERRIDE))
{ {
return numret; return numret;
} }