From 6ef47f8b74f77d02cd737614fac3c025f63e789b Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 14 Dec 2018 21:13:39 +0100 Subject: [PATCH] Fix #2166 "Freezing players with Shotgun gives typehit sound" --- qcsrc/server/g_damage.qc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 1b8f838aa..49be7c4c3 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -808,7 +808,9 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de } else if(IS_PLAYER(attacker)) { - if(deathtype != DEATH_FIRE.m_id) + // if enemy gets frozen in this frame and receives other damage don't + // play the typehitsound e.g. when hit by multiple bullets of the shotgun + if (deathtype != DEATH_FIRE.m_id && (!STAT(FROZEN, victim) || time > victim.freeze_time)) { attacker.typehitsound += 1; } -- 2.39.2