From: fgsfds <pvt.fgsfds@gmail.com>
Date: Mon, 5 Aug 2019 22:24:49 +0000 (+0300)
Subject: Merge branch 'master' of https://repo.or.cz/d2df-sdl
X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=06667349c1efd05099ff0617dfdf17dc7a097828;hp=-c

Merge branch 'master' of https://repo.or.cz/d2df-sdl
---

06667349c1efd05099ff0617dfdf17dc7a097828
diff --combined src/game/g_player.pas
index ddf4825,6492695..6bfc34c
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@@ -3191,8 -3191,6 +3191,8 @@@ end
  
  procedure TPlayer.CatchFire(Attacker: Word);
  begin
 +  if (FMegaRulez[MR_SUIT] > gTime) or (FMegaRulez[MR_INVUL] > gTime) then
 +    exit; // Íå çàãîðàåìñÿ êîãäà åñòü çàùèòà
    if FFireTime <= 0 then
      g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y);
    FFireTime := 100;
@@@ -5276,7 -5274,7 +5276,7 @@@ begi
          if FFirePainTime <= 0 then
          begin
            if g_Game_IsServer then
-             Damage(5, FFireAttacker, 0, 0, HIT_FLAME);
+             Damage(6, FFireAttacker, 0, 0, HIT_FLAME);
            FFirePainTime := 18;
          end;
          FFirePainTime := FFirePainTime - 1;