Always switch to berserk

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

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 2844773782d7fba82d31cc19611a96c5266b905a..23be583051a8a69d66adac8c96af8ae2a4e2ca23 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -2036,7 +2036,7 @@ var
 begin
   testedWeap := FCurrWeap;
   for i := WP_FIRST to WP_LAST do
-    if FWeapon[i] and (FWeapPreferences[i] > FWeapPreferences[testedWeap]) then
+    if FWeapon[i] and maySwitch(i) and (FWeapPreferences[i] > FWeapPreferences[testedWeap]) then
       testedWeap := i;
   if (R_BERSERK in FRulez) and (FWeapPreferences[WP_LAST + 1] > FWeapPreferences[testedWeap]) then
     testedWeap := WEAPON_KASTET;
@@ -2052,7 +2052,7 @@ begin
       result := false;
   end
   else if (FSwitchToEmpty = 0) and (not hasAmmoForShooting(Weapon)) then
-    result := false
+    result := false;
 end;
 
 procedure TPlayer.SwitchTeam;
@@ -3978,16 +3978,6 @@ begin
 end;
 
 function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
-
-  function allowBerserkSwitching (): Boolean;
-  begin
-    if (FBFGFireCounter <> -1) then begin result := false; exit; end;
-    result := true;
-    if gBerserkAutoswitch then exit;
-    if not conIsCheatsEnabled then exit;
-    result := false;
-  end;
-
 var
   a: Boolean;
   switchWeapon: Byte = 255;
@@ -4343,8 +4333,12 @@ begin
         if not (R_BERSERK in FRulez) then
         begin
           Include(FRulez, R_BERSERK);
-          if (shouldSwitch(WP_LAST + 1, false)) then
-            QueueWeaponSwitch(WEAPON_KASTET);
+          if (FBFGFireCounter = -1) then
+          begin
+            FCurrWeap := WEAPON_KASTET;
+            resetWeaponQueue();
+            FModel.SetWeapon(WEAPON_KASTET);
+          end;
           if gFlash <> 0 then
           begin
             Inc(FPain, 100);
@@ -8040,7 +8034,6 @@ end;
 
 
 begin
-  conRegVar('cheat_berserk_autoswitch', @gBerserkAutoswitch, 'autoswitch to fist when berserk pack taken', '',  true, true);
   conRegVar('player_indicator', @gPlayerIndicator, 'Draw indicator only for current player, also for teammates, or not at all', 'Draw indicator only for current player, also for teammates, or not at all');
   conRegVar('player_indicator_style', @gPlayerIndicatorStyle, 'Visual appearance of indicator', 'Visual appearance of indicator');
 end.