]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
remove the second touch handler hack for warpzones, let's see what breaks (we still...
authorRudolf Polzer <divverent@xonotic.org>
Mon, 31 Oct 2011 07:27:49 +0000 (08:27 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 31 Oct 2011 07:27:49 +0000 (08:27 +0100)
qcsrc/warpzonelib/server.qc

index 118b4f0f5d439017456802de601805b110a95f37..a2f92c88dffbd09db98b18a4328b3f03a33caf75 100644 (file)
@@ -1,3 +1,5 @@
+#define REMOVEHACK
+
 // for think function
 .vector warpzone_save_origin;
 .vector warpzone_save_angles;
@@ -325,11 +327,19 @@ float WarpZone_CheckProjectileImpact(entity player)
        if(!wz)
                return 0;
 
+#ifdef REMOVEHACK
+       print("impactfilter found something - and it no longer gets handled correctly - please tell divVerent whether anything behaves broken now\n");
+#else
        print("impactfilter found something - and it even gets handled correctly - please tell divVerent that this code apparently gets triggered again\n");
+#endif
        print("Entity type: ", player.classname, "\n");
        print("Origin: ", vtos(player.origin), "\n");
        print("Velocity: ", vtos(player.velocity), "\n");
 
+#ifdef REMOVEHACK
+       return 0;
+#endif
+
        // retry previous move
        setorigin(player, player.warpzone_oldorigin);
        player.velocity = player.warpzone_oldvelocity;