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

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 1945f94..f67884f 100644
--- 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;