From 6830416655b3a40dc8b46d649e6b8dbb184dcc81 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sat, 24 Jul 2010 18:53:05 +0300 Subject: [PATCH] fix ordering of kill messages, add kill messages for melee wpns ;) --- qcsrc/client/hud.qc | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/w_laser.qc | 5 ++++- qcsrc/server/w_shotgun.qc | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 10cf86f09..1a6c962ca 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -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 } diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 7c3dc9a36..45962bee7 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -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) { diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index 81a5527ac..280e42cf3 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -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; } diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 6528f22f3..1f714d1c7 100644 --- 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; } -- 2.39.2