From 7066cc79564caafb0cecfb819ca28ee094d1a62e Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 12 Aug 2017 22:47:49 +0300 Subject: [PATCH] more fucking flamer fixes --- src/game/g_player.pas | 2 +- src/game/g_weapons.pas | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/g_player.pas b/src/game/g_player.pas index e1075d4..a6f07ac 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -2884,7 +2884,7 @@ end; procedure TPlayer.CatchFire(Attacker: Word); begin - if FMegaRulez[MR_SUIT] > 0 then + if FMegaRulez[MR_SUIT] >= gTime then Exit; FFireTime := 100; FFireAttacker := Attacker; diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 0b82e18..504a176 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -1933,7 +1933,7 @@ begin Stopped := MOVE_HITCEIL; end; - a := IfThen(Stopped = 0, 5, 1); + a := IfThen(Stopped = 0, 3, 1); // Åñëè â êîãî-òî ïîïàëè if g_Weapon_Hit(@Obj, a, SpawnerUID, HIT_FLAME, False) <> 0 then begin @@ -1943,7 +1943,7 @@ begin ShotType := 0; end; - if g_Frames_Get(_id, 'FRAMES_FLAME') and (gTime mod 2 = 0) then + if g_Frames_Get(_id, 'FRAMES_FLAME') and (gTime mod 3 = 0) then begin Anim := TAnimation.Create(_id, False, 2 + Random(2)); Anim.Alpha := 0; -- 2.29.2