fix ordering of kill messages, add kill messages for melee wpns ;)

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

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 6528f22f3c1ce052d0b8519bd3e6ddaf8cda3f39..1f714d1c7c682859a7516e6cc681fb43370e935c 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -162,7 +162,10 @@ float w_shotgun(float req)
                w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "%s was gunned by %s"; // unchecked: SECONDARY
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%2$s ^7slapped %1$s ^7around a bit with a large ^2shotgun";
+               else
+                       w_deathtypestring = "%s was gunned by %s";
        }
        return TRUE;
 }