From 1e80ce57f5d8f6f38ae19625d707db3b3c9db62a Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 13 Feb 2011 21:38:46 +0100 Subject: [PATCH] ALWAYS do hitsound antispam. No need for that weapon check craziness. --- qcsrc/server/g_damage.qc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index e1ee570685..68be349714 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -789,9 +789,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float { if(damage > 0) { - if(attacker.weapon != WEP_LASER - && (attacker.weapon != WEP_ELECTRO || !autocvar_g_balance_electro_lightning) - && attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time) + if(deathtype != DEATH_FIRE) + if(attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time) { if(targ.BUTTON_CHAT) attacker.typehitsound += 1; @@ -822,8 +821,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } else { - if(deathtype != DEATH_FIRE - && attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time) + if(deathtype != DEATH_FIRE) + if(attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time) { attacker.typehitsound += 1; attacker.prevhitsound = time; -- 2.39.2