From 4d5adfb5ddec13c21ebead5d405b512a9dc379e9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Dec 2014 13:47:34 +0100
Subject: [PATCH] Fix being able to use enchantments of items that failed to
 equip (Fixes #2215)

---
 apps/openmw/mwgui/inventoryitemmodel.cpp   | 10 ++--------
 apps/openmw/mwgui/quickkeysmenu.cpp        |  4 ++++
 apps/openmw/mwgui/spellmodel.cpp           | 11 +----------
 apps/openmw/mwgui/spellwindow.cpp          |  3 +++
 apps/openmw/mwgui/tradeitemmodel.cpp       | 11 +----------
 apps/openmw/mwmechanics/aicombataction.cpp |  4 ++++
 apps/openmw/mwworld/inventorystore.cpp     | 10 ++++++++++
 apps/openmw/mwworld/inventorystore.hpp     |  3 +++
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index f45881770a..cee0dc6eed 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -99,14 +99,8 @@ void InventoryItemModel::update()
         if (mActor.getClass().hasInventoryStore(mActor))
         {
             MWWorld::InventoryStore& store = mActor.getClass().getInventoryStore(mActor);
-            for (int slot=0; slot<MWWorld::InventoryStore::Slots; ++slot)
-            {
-                MWWorld::ContainerStoreIterator equipped = store.getSlot(slot);
-                if (equipped == store.end())
-                    continue;
-                if (*equipped == newItem.mBase)
-                    newItem.mType = ItemStack::Type_Equipped;
-            }
+            if (store.isEquipped(newItem.mBase))
+                newItem.mType = ItemStack::Type_Equipped;
         }
 
         mItems.push_back(newItem);
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 7ffb51b5ab..7f56b046e2 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -326,6 +326,10 @@ namespace MWGui
             if (!item.getClass().getEquipmentSlots(item).first.empty())
             {
                 MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
+
+                // make sure that item was successfully equipped
+                if (!store.isEquipped(item))
+                    return;
             }
 
             store.setSelectedEnchantItem(it);
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 0305258978..fe2f073712 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -108,16 +108,7 @@ namespace MWGui
                 std::string charge = boost::lexical_cast<std::string>(currentCharge);
                 newSpell.mCostColumn = cost + "/" + charge;
 
-                bool equipped = false;
-                for (int i=0; i < MWWorld::InventoryStore::Slots; ++i)
-                {
-                    if (invStore.getSlot(i) != invStore.end() && *invStore.getSlot(i) == item)
-                    {
-                        equipped = true;
-                        break;
-                    }
-                }
-                newSpell.mActive = equipped;
+                newSpell.mActive = invStore.isEquipped(item);
             }
             mSpells.push_back(newSpell);
         }
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index deb971e6d4..1da9635db3 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -86,6 +86,9 @@ namespace MWGui
             && !item.getClass().getEquipmentSlots(item).first.empty())
         {
             MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
+            // make sure that item was successfully equipped
+            if (!store.isEquipped(item))
+                return;
         }
 
         MWBase::Environment::get().getWindowManager()->unsetSelectedSpell();
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index 3abfac997b..df0cbcac95 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -175,17 +175,8 @@ namespace MWGui
                 // don't show equipped items
                 if(mMerchant.getClass().hasInventoryStore(mMerchant))
                 {
-                    bool isEquipped = false;
                     MWWorld::InventoryStore& store = mMerchant.getClass().getInventoryStore(mMerchant);
-                    for (int slot=0; slot<MWWorld::InventoryStore::Slots; ++slot)
-                    {
-                        MWWorld::ContainerStoreIterator equipped = store.getSlot(slot);
-                        if (equipped == store.end())
-                            continue;
-                        if (*equipped == base)
-                            isEquipped = true;
-                    }
-                    if (isEquipped)
+                    if (store.isEquipped(base))
                         continue;
                 }
             }
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 356955b221..9bb495842c 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -201,12 +201,16 @@ namespace MWMechanics
             return 0.f;
 
         const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(ptr.getClass().getEnchantment(ptr));
+
         if (enchantment->mData.mType == ESM::Enchantment::CastOnce)
         {
             return rateEffects(enchantment->mEffects, actor, target);
         }
         else
+        {
+            //if (!ptr.getClass().canBeEquipped(ptr, actor))
             return 0.f;
+        }
     }
 
     float rateEffect(const ESM::ENAMstruct &effect, const MWWorld::Ptr &actor, const MWWorld::Ptr &target)
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index c577d4b0d2..fef34d67be 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -643,3 +643,13 @@ void MWWorld::InventoryStore::clear()
     initSlots (mSlots);
     ContainerStore::clear();
 }
+
+bool MWWorld::InventoryStore::isEquipped(const MWWorld::Ptr &item)
+{
+    for (int i=0; i < MWWorld::InventoryStore::Slots; ++i)
+    {
+        if (getSlot(i) != end() && *getSlot(i) == item)
+            return true;
+    }
+    return false;
+}
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 16d965cda3..30abc2ea57 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -145,6 +145,9 @@ namespace MWWorld
             void equip (int slot, const ContainerStoreIterator& iterator, const Ptr& actor);
             ///< \warning \a iterator can not be an end()-iterator, use unequip function instead
 
+            bool isEquipped(const MWWorld::Ptr& item);
+            ///< Utility function, returns true if the given item is equipped in any slot
+
             void setSelectedEnchantItem(const ContainerStoreIterator& iterator);
             ///< set the selected magic item (for using enchantments of type "Cast once" or "Cast when used")
             /// \note to unset the selected item, call this method with end() iterator