From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 19 Oct 2010 19:15:32 +0000 (+0200)
Subject: fix rocket no longer being remote detonatable after passing through warpzone
X-Git-Tag: xonotic-v0.1.0preview~275
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5893088bfd9149cb18f316ab7a12a766be79b838;p=xonotic%2Fxonotic-data.pk3dir.git

fix rocket no longer being remote detonatable after passing through warpzone
---

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index d4056763a..12f7647e5 100644
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -291,9 +291,13 @@ void W_Rocket_Think (void)
 
 void W_Rocket_Touch (void)
 {
+	if(WarpZone_Projectile_Touch())
+	{
+		if(wasfreed(self))
+			W_Rocket_Unregister();
+		return;
+	}
 	W_Rocket_Unregister();
-
-	PROJECTILE_TOUCH;
 	W_Rocket_Explode ();
 }