Split adjustBoundItem()

apps/openmw/mwmechanics/actors.cpp

@@ -235,13 +235,11 @@ namespace MWMechanics
         }
     };
 
-    void Actors::adjustBoundItem (const std::string& itemId, bool bound, const MWWorld::Ptr& actor)
+    void Actors::addBoundItem (const std::string& itemId, const MWWorld::Ptr& actor)
     {
         MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
         int slot = getBoundItemSlot(itemId);
 
-        if (bound)
-        {
         if (actor.getClass().getContainerStore(actor).count(itemId) != 0)
             return;
 
@@ -266,8 +264,12 @@ namespace MWMechanics
         if (prevItem != store.end())
             mPreviousItems[itemId] = *prevItem;
     }
-        else
+
+    void Actors::removeBoundItem (const std::string& itemId, const MWWorld::Ptr& actor)
     {
+        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
+        int slot = getBoundItemSlot(itemId);
+
         MWWorld::ContainerStoreIterator currentItem = store.getSlot(slot);
 
         bool wasEquipped = currentItem != store.end() && Misc::StringUtils::ciEqual((*currentItem).getCellRef().getRefId(), itemId);
@@ -299,7 +301,6 @@ namespace MWMechanics
         MWWorld::ActionEquip action(prevItem);
         action.execute(actor);
     }
-    }
 
     void Actors::updateActor (const MWWorld::Ptr& ptr, float duration)
     {
@@ -839,17 +840,14 @@ namespace MWMechanics
                 std::string item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
                             itemGmst)->getString();
 
+                magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
+
                 if (it->first == ESM::MagicEffect::BoundGloves)
                 {
-                    item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
-                                "sMagicBoundLeftGauntletID")->getString();
-                    adjustBoundItem(item, magnitude > 0, ptr);
                     item = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
                                 "sMagicBoundRightGauntletID")->getString();
-                    adjustBoundItem(item, magnitude > 0, ptr);
+                    magnitude > 0 ? addBoundItem(item, ptr) : removeBoundItem(item, ptr);
                 }
-                else
-                    adjustBoundItem(item, magnitude > 0, ptr);
             }
         }
 

apps/openmw/mwmechanics/actors.hpp

@@ -28,7 +28,8 @@ namespace MWMechanics
             typedef std::map<std::string, MWWorld::Ptr> PreviousItems;
             PreviousItems mPreviousItems;
 
-            void adjustBoundItem (const std::string& itemId, bool bound, const MWWorld::Ptr& actor);
+            void addBoundItem (const std::string& itemId, const MWWorld::Ptr& actor);
+            void removeBoundItem (const std::string& itemId, const MWWorld::Ptr& actor);
 
             void updateNpc(const MWWorld::Ptr &ptr, float duration);