From: terencehill <piuntn@gmail.com>
Date: Fri, 14 Dec 2018 20:13:39 +0000 (+0100)
Subject: Fix #2166 "Freezing players with Shotgun gives typehit sound"
X-Git-Tag: xonotic-v0.8.5~1692
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ef47f8b74f77d02cd737614fac3c025f63e789b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2166 "Freezing players with Shotgun gives typehit sound"
---

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;
 					}