From bd3b7e653d0f9745cbc2b002177c54438af0bfe0 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Wed, 10 Nov 2010 20:45:51 +0200 Subject: [PATCH] sometimes the clientside headshot detection code detects sprees as headshots or something? add a failsafe if(w == WEP_CAMPINGRIFLE || w == WEP_MINSTANEX) into there just to be sure it won't happen again. Also remove an apparent debug print from the minstanex code that prints a "h" to the console if someone gets a headshot --- qcsrc/client/hud.qc | 9 ++++----- qcsrc/server/w_minstanex.qc | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 9a203c72b..7aedac32f 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2643,14 +2643,13 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { - if(type & HITTYPE_HEADSHOT) + if((w == WEP_CAMPINGRIFLE || w == WEP_MINSTANEX) && type & HITTYPE_HEADSHOT) // all headshot weapons go here HUD_KillNotify_Push(s1, s2, 1, DEATH_HEADSHOT); else - { 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 - } + + if (alsoprint) + print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer } else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) { HUD_KillNotify_Push(s1, s2, 1, type); diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 352aa2b25..d337bbd33 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -28,7 +28,6 @@ void W_MinstaNex_Attack (void) if(headshot) { AnnounceTo(self, "headshot"); - print("h\n"); } if(damage_goodhits && self.minstanex_lasthit) { -- 2.39.2