more fucking flamer fixes

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

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index a6f07ac6f6e258522a8f867445f588e8efa9eab3..eea3f5db57e4b85c0ced6448b4d64eb642f41a86 100644 (file)
--- 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] >= gTime 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);