From 6996a15235a1eb2f167ca0bc2657731c58276004 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 2 May 2015 23:44:54 +0200 Subject: [PATCH] - fixed some overlooked merging problem. --- src/thingdef/thingdef_codeptr.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp index ce929b9ce..be9c06d60 100644 --- a/src/thingdef/thingdef_codeptr.cpp +++ b/src/thingdef/thingdef_codeptr.cpp @@ -4597,11 +4597,10 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport) ACTION_SET_RESULT(false); if (!ref) { - ACTION_SET_RESULT(false); return numret; } - if ((ref->flags2 & MF2_NOTELEPORT) && !(Flags & TF_OVERRIDE)) + if ((ref->flags2 & MF2_NOTELEPORT) && !(flags & TF_OVERRIDE)) { return numret; }