From: fgsfds <pvt.fgsfds@gmail.com>
Date: Tue, 6 Aug 2019 17:59:23 +0000 (+0300)
Subject: Game: Tweak fire pain
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=c1ffcbff92f1cda66945281f6f946acce3b6e4c7;p=d2df-sdl.git

Game: Tweak fire pain
---

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 7db6de1..81825df 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -5281,7 +5281,7 @@ begin
         end;
         FFirePainTime := FFirePainTime - 1;
         FFireTime := FFireTime - 1;
-        if ((FFireTime mod 36) = 0) and (FMegaRulez[MR_INVUL] < gTime) then
+        if ((FFireTime mod 33) = 0) and (FMegaRulez[MR_INVUL] < gTime) then
           FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y);
         if (FFireTime = 0) and g_Game_IsNet and g_Game_IsServer then
           MH_SEND_PlayerStats(FUID);
@@ -5314,7 +5314,7 @@ begin
             else if FHealth > -50 then Kill(K_HARDKILL, FLastSpawnerUID, FLastHit)
               else Kill(K_EXTRAHARDKILL, FLastSpawnerUID, FLastHit);
 
-      if FAlive and (FFireTime <= 0) then
+      if FAlive and ((FLastHit <> HIT_FLAME) or (FFireTime <= 0)) then
       begin
         if FDamageBuffer <= 20 then FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y)
           else if FDamageBuffer <= 55 then FModel.PlaySound(MODELSOUND_PAIN, 2, FObj.X, FObj.Y)