Merge branch 'maluu-apa-bosku' into 'master'

Play down sound when equip fails

Closes #7371

See merge request OpenMW/openmw!4248

apps/openmw/mwclass/weapon.cpp

@@ -270,14 +270,14 @@ namespace MWClass
 
     std::pair<int, std::string_view> Weapon::canBeEquipped(const MWWorld::ConstPtr& ptr, const MWWorld::Ptr& npc) const
     {
-        if (hasItemHealth(ptr) && getItemHealth(ptr) == 0)
-            return { 0, "#{sInventoryMessage1}" };
-
         // Do not allow equip weapons from inventory during attack
         if (npc.isInCell() && MWBase::Environment::get().getWindowManager()->isGuiMode()
             && MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc))
             return { 0, "#{sCantEquipWeapWarning}" };
 
+        if (hasItemHealth(ptr) && getItemHealth(ptr) == 0)
+            return { 0, "#{sInventoryMessage1}" };
+
         std::pair<std::vector<int>, bool> slots_ = getEquipmentSlots(ptr);
 
         if (slots_.first.empty())

apps/openmw/mwgui/inventorywindow.cpp

@@ -522,36 +522,25 @@ namespace MWGui
         }
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
+        auto type = ptr.getType();
+        bool isWeaponOrArmor = type == ESM::Weapon::sRecordId || type == ESM::Armor::sRecordId;
+        bool isBroken = ptr.getClass().hasItemHealth(ptr) && ptr.getCellRef().getCharge() == 0;
 
-        // early-out for items that need to be equipped, but can't be equipped: we don't want to set OnPcEquip in that
-        // case
-        if (!ptr.getClass().getEquipmentSlots(ptr).first.empty())
-        {
-            if (ptr.getClass().hasItemHealth(ptr) && ptr.getCellRef().getCharge() == 0)
+        // In vanilla, broken armor or weapons cannot be equipped
+        // tools with 0 charges is equippable
+        if (isBroken && isWeaponOrArmor)
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage1}");
-                updateItemView();
             return;
         }
 
-            if (!force)
-            {
-                auto canEquip = ptr.getClass().canBeEquipped(ptr, player);
-
-                if (canEquip.first == 0)
-                {
-                    MWBase::Environment::get().getWindowManager()->messageBox(canEquip.second);
-                    updateItemView();
-                    return;
-                }
-            }
-        }
+        bool canEquip = ptr.getClass().canBeEquipped(ptr, mPtr).first != 0;
+        bool shouldSetOnPcEquip = canEquip || force;
 
         // If the item has a script, set OnPCEquip or PCSkipEquip to 1
-        if (!script.empty())
+        if (!script.empty() && shouldSetOnPcEquip)
         {
             // Ingredients, books and repair hammers must not have OnPCEquip set to 1 here
-            auto type = ptr.getType();
             bool isBook = type == ESM::Book::sRecordId;
             if (!isBook && type != ESM::Ingredient::sRecordId && type != ESM::Repair::sRecordId)
                 ptr.getRefData().getLocals().setVarByInt(script, "onpcequip", 1);
@@ -561,7 +550,7 @@ namespace MWGui
         }
 
         std::unique_ptr<MWWorld::Action> action = ptr.getClass().use(ptr, force);
-        action->execute(player);
+        action->execute(player, !canEquip);
 
         // Handles partial equipping (final part)
         if (mEquippedStackableCount.has_value())
@@ -592,6 +581,14 @@ namespace MWGui
         {
             MWWorld::Ptr ptr = mDragAndDrop->mItem.mBase;
 
+            auto [canEquipRes, canEquipMsg] = ptr.getClass().canBeEquipped(ptr, mPtr);
+            if (canEquipRes == 0) // cannot equip
+            {
+                mDragAndDrop->drop(mTradeModel, mItemView); // also plays down sound
+                MWBase::Environment::get().getWindowManager()->messageBox(canEquipMsg);
+                return;
+            }
+
             mDragAndDrop->finish();
 
             if (mDragAndDrop->mSourceModel != mTradeModel)

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -84,9 +84,8 @@ namespace MWGui
             case ESM::QuickKeys::Type::MagicItem:
             {
                 MWWorld::Ptr item = *mKey[index].button->getUserData<MWWorld::Ptr>();
-                // Make sure the item is available and is not broken
-                if (item.isEmpty() || item.getCellRef().getCount() < 1
-                    || (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
+                // Make sure the item is available
+                if (item.isEmpty() || item.getCellRef().getCount() < 1)
                 {
                     // Try searching for a compatible replacement
                     item = store.findReplacement(mKey[index].id);
@@ -384,23 +383,16 @@ namespace MWGui
             if (it == store.end())
                 item = nullptr;
 
-            // check the item is available and not broken
-            if (item.isEmpty() || item.getCellRef().getCount() < 1
-                || (item.getClass().hasItemHealth(item) && item.getClass().getItemHealth(item) <= 0))
-            {
-                item = store.findReplacement(key->id);
-
+            // check the quickkey item is available
             if (item.isEmpty() || item.getCellRef().getCount() < 1)
             {
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sQuickMenu5} " + key->name);
-
                 return;
             }
-            }
 
             if (key->type == ESM::QuickKeys::Type::Item)
             {
-                if (!store.isEquipped(item))
+                if (!store.isEquipped(item.getCellRef().getRefId()))
                     MWBase::Environment::get().getWindowManager()->useItem(item);
                 MWWorld::ConstContainerStoreIterator rightHand
                     = store.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);

apps/openmw/mwworld/actionequip.cpp

@@ -21,11 +21,10 @@ namespace MWWorld
         MWWorld::Ptr object = getTarget();
         MWWorld::InventoryStore& invStore = actor.getClass().getInventoryStore(actor);
 
-        if (object.getClass().hasItemHealth(object) && object.getCellRef().getCharge() == 0)
+        if (actor != MWMechanics::getPlayer())
         {
-            if (actor == MWMechanics::getPlayer())
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage1}");
-
+            // player logic is handled in InventoryWindow::useItem
+            if (object.getClass().hasItemHealth(object) && object.getCellRef().getCharge() == 0)
                 return;
         }
 

apps/openmw/mwworld/inventorystore.cpp

@@ -732,6 +732,16 @@ bool MWWorld::InventoryStore::isEquipped(const MWWorld::ConstPtr& item)
     return false;
 }
 
+bool MWWorld::InventoryStore::isEquipped(const ESM::RefId& id)
+{
+    for (int i = 0; i < MWWorld::InventoryStore::Slots; ++i)
+    {
+        if (getSlot(i) != end() && getSlot(i)->getCellRef().getRefId() == id)
+            return true;
+    }
+    return false;
+}
+
 bool MWWorld::InventoryStore::isFirstEquip()
 {
     bool first = mFirstAutoEquip;

apps/openmw/mwworld/inventorystore.hpp

@@ -117,6 +117,7 @@ namespace MWWorld
         ///< \warning \a iterator can not be an end()-iterator, use unequip function instead
 
         bool isEquipped(const MWWorld::ConstPtr& item);
+        bool isEquipped(const ESM::RefId& id);
         ///< Utility function, returns true if the given item is equipped in any slot
 
         void setSelectedEnchantItem(const ContainerStoreIterator& iterator);