make the shotgun melee attack damage bodies/clones as well

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

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 81a5527ac57f8c557e7aa7efc30463f6a4b8800a..18715a9b4ba51ff79c7f995cd665d5a0bb1e88b5 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -145,6 +145,7 @@ void gauntletbeam_think()
                vector force;
                force = w_shotdir * myforce;
                Damage (trace_ent, self.owner, self.owner, damage * dt, WEP_LASER | HITTYPE_SECONDARY, trace_endpos, force * dt);
+               Damage_RecordDamage(self.owner, WEP_LASER | HITTYPE_SECONDARY, damage * dt);
        }
 
        // draw effect
@@ -280,7 +281,10 @@ float w_laser(float req)
                w_deathtypestring = "%s lasered themself to hell";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "%s was lasered to death by %s"; // unchecked: SPLASH
+               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;
 }