X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=1945f94f26be4d2c1a69de7416209db816648a5f;hb=cbb81a52dd4f9a0552283b2031dec999dba0a824;hp=f80d72195105d1d96dcbffd5a0f7a63dd8efb2fd;hpb=888edf84e9dcca93ffd056846e492942c1a18e38;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index f80d721..1945f94 100644
--- 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 hasAmmoForShooting (weapon: Byte): Boolean;
     function shouldSwitch (weapon: Byte; hadWeapon: Boolean) : Boolean;
 
     procedure doDamage (v: Integer);
@@ -1997,38 +1998,41 @@ begin
 end;
 
 procedure TPlayer.SetWeaponPrefs(Prefs: Array of Byte);
-var i: Integer;
+var
+  i: Integer;
 begin
   for i := WP_FIRST to WP_LAST + 1 do
     begin
-      if (Prefs[i] < 0) or (Prefs[i] > WP_LAST + 1) then
+      if (Prefs[i] > WP_LAST + 1) then
         FWeapPreferences[i] := 0
-      else FWeapPreferences[i] := Prefs[i];
+      else
+        FWeapPreferences[i] := Prefs[i];
     end;
 end;
 
 procedure TPlayer.SetWeaponPref(Weapon, Pref: Byte);
 begin
-  if (Weapon < 0) or (Weapon > WP_LAST + 1) then
+  if (Weapon > WP_LAST + 1) then
     exit
-  else if (Pref >= 0) and (Pref <= WP_LAST + 1) and (Weapon >= 0) and (Weapon <= WP_LAST + 1) then
+  else if (Pref <= WP_LAST + 1) and (Weapon <= WP_LAST + 1) then
     FWeapPreferences[Weapon] := Pref
-  else if (Weapon >= 0) and (Weapon <= WP_LAST + 1) and ((Pref < 0) or (Pref > WP_LAST + 1)) then
+  else if (Weapon <= WP_LAST + 1) and (Pref > WP_LAST + 1) then
     FWeapPreferences[Weapon] := 0;
 end;
 
 function TPlayer.GetWeaponPref(Weapon: Byte) : Byte;
 begin
-  if (Weapon < 0) or (Weapon > WP_LAST + 1) then
+  if (Weapon > WP_LAST + 1) then
     result := 0
-  else if (FWeapPreferences[Weapon] < 0) or (FWeapPreferences[Weapon] > WP_LAST + 1) then
+  else if (FWeapPreferences[Weapon] > WP_LAST + 1) then
     result := 0
   else
     result := FWeapPreferences[Weapon];
 end;
 
 function TPlayer.GetMorePrefered() : Byte;
-var testedWeap, i: Byte;
+var
+  testedWeap, i: Byte;
 begin
   testedWeap := FCurrWeap;
   for i := WP_FIRST to WP_LAST do
@@ -2047,8 +2051,8 @@ begin
     if (FSkipFist = 1) and (not (R_BERSERK in FRulez)) then
       result := false;
   end
-  else if (FSwitchToEmpty = 0) and (not hasAmmoForWeapon(Weapon)) then
-    result := false
+  else if (FSwitchToEmpty = 0) and (not hasAmmoForShooting(Weapon)) then
+    result := false;
 end;
 
 procedure TPlayer.SwitchTeam;
@@ -3780,10 +3784,26 @@ begin
   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;
-  if (weapon < 0) or (weapon > WP_LAST + 1) then
+  if (weapon > WP_LAST + 1) then
     begin
       result := false;
       exit;
@@ -3970,7 +3990,7 @@ function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean
 
 var
   a: Boolean;
-  switchWeapon: Byte = -1;
+  switchWeapon: Byte = 255;
   hadWeapon: Boolean = False;
 begin
   Result := False;