diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 88070c61c04866a6c79bcea7dc8d39f88545fa12..6bfc34c0de5302e5291f7d323429e2df16249fbb 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
procedure TPlayer.CatchFire(Attacker: Word);
begin
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;
if FFireTime <= 0 then
g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y);
FFireTime := 100;
if FFirePainTime <= 0 then
begin
if g_Game_IsServer then
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;
FFirePainTime := 18;
end;
FFirePainTime := FFirePainTime - 1;