more fucking flamer fixes

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index e1075d40b3d6263db60343dd0349ac33b122d2b0..a6f07ac6f6e258522a8f867445f588e8efa9eab3 100644 (file)
--- 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 0b82e18f5343b542edcb69bfeb0f908f2f889233..504a1766747c7c54c1c206a10fc0b57566c2d20f 100644 (file)
--- 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;