X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=989dfe962329ed576f63a1837aae1b04bcab83c4;hb=52ae1315c1851e595d12ffc13e2407dee0b24e5e;hp=4d98f0c91cd50927abfecdacd53c1b82c6a35dec;hpb=fcbf9538330960b989dbe84e7188349d7e8b109f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 4d98f0c91..989dfe962 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -45,7 +45,7 @@ void W_Mine_Stick (entity to)
 
 	newmine.mine_time = self.mine_time;
 
-	newmine.touch = SUB_Null;
+	newmine.touch = func_null;
 	newmine.think = W_Mine_Think;
 	newmine.nextthink = time;
 	newmine.cnt = self.cnt;
@@ -67,7 +67,7 @@ void W_Mine_Explode ()
 					if(IsFlying(other))
 						AnnounceTo(self.realowner, "airshot");
 
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	self.takedamage = DAMAGE_NO;
 
 	RadiusDamage (self, self.realowner, autocvar_g_balance_minelayer_damage, autocvar_g_balance_minelayer_edgedamage, autocvar_g_balance_minelayer_radius, world, autocvar_g_balance_minelayer_force, self.projectiledeathtype, other);
@@ -91,7 +91,7 @@ void W_Mine_Explode ()
 
 void W_Mine_DoRemoteExplode ()
 {
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	self.takedamage = DAMAGE_NO;
 
 	if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW)
@@ -509,6 +509,14 @@ float w_minelayer(float req)
 	{
 		W_Reload(autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		return WEAPON_MINELAYER_SUICIDE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		return WEAPON_MINELAYER_MURDER;
+	}
 	return TRUE;
 }
 #endif
@@ -527,20 +535,6 @@ float w_minelayer(float req)
 	{
 		precache_sound("weapons/mine_exp.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-		if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-			w_deathtypestring = _("%s blew themself up with their minelayer");
-		else
-			w_deathtypestring = _("%s forgot about their mine");
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-			w_deathtypestring = _("%s got too close to %s's mine");
-		else if(w_deathtype & HITTYPE_SPLASH)
-			w_deathtypestring = _("%s almost dodged %s's mine");
-		else
-			w_deathtypestring = _("%s stepped on %s's mine");
-	}
 	return TRUE;
 }
 #endif