Fix #2166 "Freezing players with Shotgun gives typehit sound"
authorterencehill <piuntn@gmail.com>
Fri, 14 Dec 2018 20:13:39 +0000 (21:13 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 14 Dec 2018 20:13:39 +0000 (21:13 +0100)
qcsrc/server/g_damage.qc

index 1b8f838..49be7c4 100644 (file)
@@ -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;
                                        }