Fix BFG and SSG empty switching

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index f80d72195105d1d96dcbffd5a0f7a63dd8efb2fd..f1a38c900d2049d411e2483069992abf104baf50 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -240,6 +240,7 @@ type
     function getNextWeaponIndex (): Byte; // return 255 for "no switch"
     procedure resetWeaponQueue ();
     function hasAmmoForWeapon (weapon: Byte): Boolean;
     function getNextWeaponIndex (): Byte; // return 255 for "no switch"
     procedure resetWeaponQueue ();
     function hasAmmoForWeapon (weapon: Byte): Boolean;

+    function hasAmmoForShooting (weapon: Byte): Boolean;

     function shouldSwitch (weapon: Byte; hadWeapon: Boolean) : Boolean;
 
     procedure doDamage (v: Integer);
     function shouldSwitch (weapon: Byte; hadWeapon: Boolean) : Boolean;
 
     procedure doDamage (v: Integer);


@@ -2047,7 +2048,7 @@ begin
     if (FSkipFist = 1) and (not (R_BERSERK in FRulez)) then
       result := false;
   end
     if (FSkipFist = 1) and (not (R_BERSERK in FRulez)) then
       result := false;
   end

-  else if (FSwitchToEmpty = 0) and (not hasAmmoForWeapon(Weapon)) then
+  else if (FSwitchToEmpty = 0) and (not hasAmmoForShooting(Weapon)) then

     result := false
 end;
 
     result := false
 end;
 


@@ -3780,6 +3781,22 @@ begin
   end;
 end;
 
   end;
 end;
 

+function TPlayer.hasAmmoForShooting (weapon: Byte): Boolean;
+begin
+  result := false;
+  case weapon of
+    WEAPON_KASTET, WEAPON_SAW: result := true;
+    WEAPON_SHOTGUN1, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
+    WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 1);
+    WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0);
+    WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
+    WEAPON_PLASMA: result := (FAmmo[A_CELLS] > 0);
+    WEAPON_BFG: result := (FAmmo[A_CELLS] >= 40);
+    WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);
+    else result := (weapon < length(FWeapon));
+  end;
+end;
+

 function TPlayer.shouldSwitch (weapon: Byte; hadWeapon: Boolean): Boolean;
 begin
   result := false;
 function TPlayer.shouldSwitch (weapon: Byte; hadWeapon: Boolean): Boolean;
 begin
   result := false;