From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 31 Oct 2011 07:27:49 +0000 (+0100)
Subject: remove the second touch handler hack for warpzones, let's see what breaks (we still... 
X-Git-Tag: xonotic-v0.6.0~35^2~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=849f0660a88cd0ec5a1563cd700bf4cff3ef8916;p=xonotic%2Fxonotic-data.pk3dir.git

remove the second touch handler hack for warpzones, let's see what breaks (we still get the debug message)
---

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 118b4f0f5..a2f92c88d 100644
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -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;