X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=eea3f5db57e4b85c0ced6448b4d64eb642f41a86;hb=8d318aca88d4253961e698b0cd05399989efe252;hp=e1075d40b3d6263db60343dd0349ac33b122d2b0;hpb=3783830edebbddb553cbac365d0c6259e482a9ee;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index e1075d4..eea3f5d 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -2884,8 +2884,6 @@ end; procedure TPlayer.CatchFire(Attacker: Word); begin - if FMegaRulez[MR_SUIT] > 0 then - Exit; FFireTime := 100; FFireAttacker := Attacker; if g_Game_IsNet and g_Game_IsServer then @@ -4850,6 +4848,12 @@ begin FFireTime := 0; FFirePainTime := 0; end + else if FMegaRulez[MR_SUIT] >= gTime then + begin + if FMegaRulez[MR_SUIT] = gTime then + FFireTime := 1; + FFirePainTime := 0; + end else begin OnFireFlame(1);