X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=300979a87de4011a595a4d59af4704d9132f74a3;hb=254041134b399e948e554ae99171174a7087ae40;hp=64b400d3dbb6c679b1fdb5a8f6ec18cf788ac078;hpb=f98d08606610e3f3d05b159cfefbaf8bb4874a05;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 64b400d..300979a 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -3980,15 +3980,17 @@ begin
         if not (R_BERSERK in FRulez) then
         begin
           Include(FRulez, R_BERSERK);
-          if FBFGFireCounter = -1 then
+          if gBerserkAutoswitch and (FBFGFireCounter = -1) then
           begin
             FCurrWeap := WEAPON_KASTET;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
           if gFlash <> 0 then
+          begin
             Inc(FPain, 100);
             if gFlash = 2 then Inc(FPickup, 5);
+          end;
           FBerserk := gTime+30000;
           Result := True;
           remove := True;