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

[d2df-sdl.git] / src / game / g_player.pas

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 6492695c3ac29fa312b3bfb4927b0c12af8b7aa7..6bfc34c0de5302e5291f7d323429e2df16249fbb 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -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;