DEADSOFTWARE

weapbest: skip empty
authortravi$ <aidenkovbk@mail.ru>
Sun, 27 Mar 2022 16:11:46 +0000 (19:11 +0300)
committerDmitry Lyashuk <terminalhash@th-mx>
Sun, 27 Mar 2022 16:17:54 +0000 (19:17 +0300)
src/game/g_player.pas

index 1945f94f26be4d2c1a69de7416209db816648a5f..f67884fa5f429c07618c3c90c6535e642815f393 100644 (file)
@@ -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;