X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_laser.qc;h=69dcb17aa5c292d4328b539668c8dac674f76935;hb=0ddc37cf03d809916b949eb50fe6a482977e07b0;hp=5e2bb075aa5c7ff1a4fd6b258ac2cea9661954a7;hpb=c5121d69899c57253362a5a8d98d6a1435a5fb47;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 5e2bb075a..69dcb17aa 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -9,7 +9,7 @@ void W_Laser_Touch (void)
 {
 	PROJECTILE_TOUCH;
 
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	if (self.dmg)
 		RadiusDamage (self, self.realowner, autocvar_g_balance_laser_secondary_damage, autocvar_g_balance_laser_secondary_edgedamage, autocvar_g_balance_laser_secondary_radius, world, autocvar_g_balance_laser_secondary_force, self.projectiledeathtype, other);
 	else
@@ -291,6 +291,14 @@ float w_laser(float req)
 	{
 		W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		return WEAPON_LASER_SUICIDE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		return WEAPON_LASER_MURDER;
+	}
 	return TRUE;
 }
 #endif
@@ -309,15 +317,6 @@ float w_laser(float req)
 	{
 		precache_sound("weapons/laserimpact.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = _("%s lasered themself to hell");
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SECONDARY)
-			w_deathtypestring = _("%s was cut in half by %s's gauntlet"); // unchecked: SPLASH
-		else
-			w_deathtypestring = _("%s was lasered to death by %s"); // unchecked: SPLASH
-	}
 	return TRUE;
 }
 #endif