Merge branch 'master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_rocketlauncher.qc

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index f12c2fab1e6927afde0426ab1ca19c3288b4f280..12f7647e570c9b262373350a20c4260de8238152 100644 (file)
--- 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 ();
 }
 
@@ -586,15 +590,15 @@ float w_rlauncher(float req)
                precache_sound("weapons/rocket_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "exploded";
+               w_deathtypestring = "%s exploded";
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-                       w_deathtypestring = "got too close to #'s rocket";
+                       w_deathtypestring = "%s got too close to %s's rocket";
                else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "almost dodged #'s rocket";
+                       w_deathtypestring = "%s almost dodged %s's rocket";
                else
-                       w_deathtypestring = "ate #'s rocket";
+                       w_deathtypestring = "%s ate %s's rocket";
        }
        return TRUE;
 }