]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix rocket no longer being remote detonatable after passing through warpzone
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 19:15:32 +0000 (21:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 19:15:32 +0000 (21:15 +0200)
qcsrc/server/w_rocketlauncher.qc

index d4056763a84d1e418075a0bd7ffe6a35318eb798..12f7647e570c9b262373350a20c4260de8238152 100644 (file)
@@ -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 ();
 }