diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index eaca77a170f12cba3dc24e35373c08595042281e..3d1b927b6f7f78bea422f0cf7a480dead5133473 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
result := false;
case weapon of
WEAPON_KASTET, WEAPON_SAW: result := true;
- WEAPON_SHOTGUN1, WEAPON_SHOTGUN2, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
- WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0);
+ WEAPON_SHOTGUN1, WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 0);
+ WEAPON_PISTOL, WEAPON_CHAINGUN, WEAPON_SUPERPULEMET: result := (FAmmo[A_BULLETS] > 0);
WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
WEAPON_PLASMA, WEAPON_BFG: result := (FAmmo[A_CELLS] > 0);
WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);
// find next weapon to switch onto
cwi := curlidx;
- for i := 0 to High(weaponOrder) do
+ for i := 0 to High(FWeapon) do
begin
- cwi := (cwi+length(weaponOrder)+1) mod length(weaponOrder);
+ cwi := (cwi+length(FWeapon)+1) mod length(FWeapon);
if (cwi = curlidx) then continue; // skip current weapon
if not wantThisWeapon[cwi] then continue;
rwidx := weaponOrder[cwi];
if (rwidx < 0) then continue;
- //e_WriteLog(Format(' trying logical %d (real %d); has=%d, hasammo=%d', [cwi, rwidx, Integer(FWeapon[rwidx]), Integer(hasAmmoForWeapon(rwidx))]), TMsgType.Warning);
+ //e_WriteLog(Format(' trying logical %d (real %d)', [cwi, rwidx]), TMsgType.Warning);
if FWeapon[rwidx] and ((wwc = 1) or hasAmmoForWeapon(rwidx)) then
begin
//e_WriteLog(' I FOUND HER!', TMsgType.Warning);