diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 2844773782d7fba82d31cc19611a96c5266b905a..f67884fa5f429c07618c3c90c6535e642815f393 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
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;
result := false;
end
else if (FSwitchToEmpty = 0) and (not hasAmmoForShooting(Weapon)) then
- result := false
+ result := false;
end;
procedure TPlayer.SwitchTeam;