X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_grenadelauncher.qc;h=b463a4e71ab0c18823678c8bd9d992060698dbe0;hb=3b4538464212cdef7e377e6e203e820178a76fe6;hp=5f6c0346f5cf3c11137bf6e5271487fb764b263e;hpb=8dd9e564bf844bd71312218ce4714e6324d6beb5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 5f6c0346f..b463a4e71 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -14,7 +14,7 @@ void W_Grenade_Explode (void)
 					if(IsFlying(other))
 						AnnounceTo(self.realowner, "airshot");
 
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	self.takedamage = DAMAGE_NO;
 
 	if(self.movetype == MOVETYPE_NONE)
@@ -34,7 +34,7 @@ void W_Grenade_Explode2 (void)
 					if(IsFlying(other))
 						AnnounceTo(self.realowner, "airshot");
 
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	self.takedamage = DAMAGE_NO;
 
 	if(self.movetype == MOVETYPE_NONE)
@@ -366,6 +366,20 @@ float w_glauncher(float req)
 	{
 		W_Reload(min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo), autocvar_g_balance_grenadelauncher_reload_ammo, autocvar_g_balance_grenadelauncher_reload_time, "weapons/reload.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_MORTAR_SUICIDE_BOUNCE;
+		else
+			return WEAPON_MORTAR_SUICIDE_EXPLODE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_MORTAR_MURDER_BOUNCE;
+		else
+			return WEAPON_MORTAR_MURDER_EXPLODE;
+	}
 	return TRUE;
 }
 #endif
@@ -384,23 +398,6 @@ float w_glauncher(float req)
 	{
 		precache_sound("weapons/grenade_impact.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SECONDARY)
-			w_deathtypestring = _("%s didn't see their own grenade");
-		else
-			w_deathtypestring = _("%s blew themself up with their grenadelauncher");
-	}
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SPLASH)
-			if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
-				w_deathtypestring = _("%s didn't see %s's grenade");
-			else // unchecked: SECONDARY
-				w_deathtypestring = _("%s almost dodged %s's grenade");
-		else // unchecked: SECONDARY, BOUNCE
-			w_deathtypestring = _("%s ate %s's grenade");
-	}
 	return TRUE;
 }
 #endif