]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Clean up a movetype check in warpzone code
authorMario <mario@smbclan.net>
Thu, 1 Mar 2018 14:29:17 +0000 (00:29 +1000)
committerMario <mario@smbclan.net>
Thu, 1 Mar 2018 14:29:17 +0000 (00:29 +1000)
qcsrc/lib/warpzone/server.qc

index 8246e106de54165f014b548b50adb247009a7a91..ce4535452da5405d3b57495462ac51d27c9dd1ce 100644 (file)
@@ -177,11 +177,7 @@ void WarpZone_Touch(entity this, entity toucher)
                return;
 
        // FIXME needs a better check to know what is safe to teleport and what not
-       if((toucher.move_movetype == MOVETYPE_NONE && toucher.move_movetype == MOVETYPE_NONE) || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.tag_entity
-#ifdef CSQC
-       || tag_networkentity
-#endif
-       )
+       if(toucher.move_movetype == MOVETYPE_NONE || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.tag_entity)
                return;
 
        if(WarpZoneLib_ExactTrigger_Touch(this, toucher))