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

diff --combined src/game/g_player.pas
index ddf4825b2ee994232eaf81bc22a58ff101935c65,6492695c3ac29fa312b3bfb4927b0c12af8b7aa7..6bfc34c0de5302e5291f7d323429e2df16249fbb
--- 1/src/game/g_player.pas
--- 2/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;