X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=b03214f79289ddf17b1d59b3302ee25bdf56844c;hb=8aa3b888af2fecd61de66106bc2b027fda93914d;hp=bcad3ca07b1ce6a1cd202e0a9613928ce45ad840;hpb=ceef3cf5ed716aab604357b2805a978cb9c6bab6;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index bcad3ca..b03214f 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -2821,10 +2821,12 @@ begin
         else
           g_Sound_PlayExAt('SOUND_WEAPON_MISSBERSERK', FObj.X, FObj.Y);
 
-        if gFlash = 1 then
-          if FPain < 50 then
-            FPain := min(FPain + 25, 50);
-      end else g_Weapon_punch(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, 3, FUID);
+        if (gFlash = 1) and (FPain < 50) then FPain := min(FPain + 25, 50);
+      end
+      else
+      begin
+        g_Weapon_punch(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, 3, FUID);
+      end;
 
       DidFire := True;
       FReloading[FCurrWeap] := WEAPON_RELOAD[FCurrWeap];