fix ordering of kill messages, add kill messages for melee wpns ;)
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 15:53:05 +0000 (18:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 15:53:05 +0000 (18:53 +0300)
qcsrc/client/hud.qc
qcsrc/server/g_damage.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_shotgun.qc

index 10cf86f..1a6c962 100644 (file)
@@ -2437,7 +2437,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
        } else if(msg == MSG_KILL) {
                w = DEATH_WEAPONOF(type);
                if(WEP_VALID(w)) {
-                       HUD_KillNotify_Push(s2, s1, 1, type);
+                       HUD_KillNotify_Push(s1, s2, 1, type);
                        if (alsoprint)
                                print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer
                }
index 7c3dc9a..45962be 100644 (file)
@@ -370,7 +370,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        msg = ftos(strstrofs(inflictor.message2, "#", 0));
                                }
 
-                               Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
+                               Send_KillNotification(a, s, msg, deathtype, MSG_KILL);
 
                                if(g_ctf && targ.flagcarried)
                                {
index 81a5527..280e42c 100644 (file)
@@ -280,7 +280,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;
 }
index 6528f22..1f714d1 100644 (file)
@@ -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;
 }