X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=c109fc796b68afeb88d1b62d683083bd33062c29;hb=4fc59bbd7e2d4f25ba21952ed50ae754295a7faa;hp=f12c2fab1e6927afde0426ab1ca19c3288b4f280;hpb=573264b805dbe29d7351ba996fbde4896caf7a1b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index f12c2fab1..c109fc796 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 ();
 }
 
@@ -363,6 +367,7 @@ void W_Rocket_Attack (void)
 	W_AttachToShotorg(flash, '5 0 0');
 
 	// common properties
+	other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void spawnfunc_weapon_rocketlauncher (void); // defined in t_items.qc
@@ -586,15 +591,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;
 }