Cycle only through weapons which can be equipped by player (bug #4104)

7 years ago · 10a0136b4a
parent f594eda574
commit 10a0136b4a
1 changed files with 3 additions and 1 deletions
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@ -717,7 +717,9 @@ namespace MWGui

            lastId = item.getCellRef().getRefId();

-            if (item.getClass().getTypeName() == typeid(ESM::Weapon).name() && isRightHandWeapon(item))
+            if (item.getClass().getTypeName() == typeid(ESM::Weapon).name() &&
+                isRightHandWeapon(item) &&
+                item.getClass().canBeEquipped(item, player).first)
            {
                found = true;
                break;