From 48d9885554cdddb7c813035f9d226228f91ac310 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Fri, 5 Apr 2013 15:42:05 +0200
Subject: [PATCH 01/10] Started bugfix #691

---
 apps/openmw/mwclass/armor.cpp          |  87 +++++++++++++++++++++
 apps/openmw/mwclass/armor.hpp          |   2 +
 apps/openmw/mwclass/clothing.cpp       |  61 +++++++++++++++
 apps/openmw/mwclass/clothing.hpp       |   2 +
 apps/openmw/mwclass/weapon.cpp         |  66 ++++++++++++++++
 apps/openmw/mwclass/weapon.hpp         |   2 +
 apps/openmw/mwmechanics/actors.cpp     |   3 +-
 apps/openmw/mwworld/actionequip.cpp    | 104 +------------------------
 apps/openmw/mwworld/class.cpp          |   5 ++
 apps/openmw/mwworld/class.hpp          |   3 +
 apps/openmw/mwworld/inventorystore.cpp |   6 +-
 apps/openmw/mwworld/inventorystore.hpp |   2 +-
 12 files changed, 237 insertions(+), 106 deletions(-)

diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 320944d3c..496e69545 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -16,6 +16,8 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/physicssystem.hpp"
 #include "../mwworld/nullaction.hpp"
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -290,6 +292,91 @@ namespace MWClass
         ref->mBase = record;
     }
 
+    bool Armor::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    {
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
+
+        // slots that this item can be equipped in
+        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
+
+        // retrieve ContainerStoreIterator to the item
+        MWWorld::ContainerStoreIterator it = invStore.begin();
+        for (; it != invStore.end(); ++it)
+        {
+            if (*it == item)
+            {
+                break;
+            }
+        }
+
+        assert(it != invStore.end());
+
+        std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
+
+        for (std::vector<int>::const_iterator slot=slots.first.begin();
+            slot!=slots.first.end(); ++slot)
+        {
+
+            // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
+            const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
+            if(race->mData.mFlags & ESM::Race::Beast)
+            {
+                if(*slot == MWWorld::InventoryStore::Slot_Helmet)
+                {
+                    std::vector<ESM::PartReference> parts;
+                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
+                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+                    else
+                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+
+                    bool allow = true;
+                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                    {
+                        if((*itr).mPart == ESM::PRT_Head)
+                        {
+                            if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
+
+                            allow = false;
+                            break;
+                        }
+                    }
+
+                    if(!allow)
+                        break;
+                }
+
+                if (*slot == MWWorld::InventoryStore::Slot_Boots)
+                {
+                    bool allow = true;
+                    std::vector<ESM::PartReference> parts;
+                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
+                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+                    else
+                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                    {
+                        if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
+                        {
+                            allow = false;
+                            // Only notify the player, not npcs
+                            if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                            {
+                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}");
+                            }
+                            break;
+                        }
+                    }
+
+                    if(!allow)
+                        return false;
+                }
+
+            }
+        }
+        return true;
+    }
+
     boost::shared_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr) const
     {
         boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 65f49abb7..bb07e42b0 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -67,6 +67,8 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
+            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index abad26767..77a7557bf 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -14,6 +14,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/physicssystem.hpp"
 #include "../mwworld/nullaction.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
@@ -237,6 +238,66 @@ namespace MWClass
         ref->mBase = record;
     }
 
+    bool Clothing::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    {
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
+
+        // slots that this item can be equipped in
+        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
+
+        // retrieve ContainerStoreIterator to the item
+        MWWorld::ContainerStoreIterator it = invStore.begin();
+        for (; it != invStore.end(); ++it)
+        {
+            if (*it == item)
+            {
+                break;
+            }
+        }
+
+        assert(it != invStore.end());
+
+        std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
+
+        for (std::vector<int>::const_iterator slot=slots.first.begin();
+            slot!=slots.first.end(); ++slot)
+        {
+
+            // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
+            const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
+            if(race->mData.mFlags & ESM::Race::Beast)
+            {
+                if (*slot == MWWorld::InventoryStore::Slot_Boots)
+                {
+                    bool allow = true;
+                    std::vector<ESM::PartReference> parts;
+                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
+                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+                    else
+                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                    {
+                        if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
+                        {
+                            allow = false;
+                            // Only notify the player, not npcs
+                            if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                            {
+                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}");
+                            }
+                            break;
+                        }
+                    }
+
+                    if(!allow)
+                        return false;
+                }
+
+            }
+        }
+        return true;
+    }
+
     boost::shared_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr) const
     {
         boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index c3ef22f11..4978fa228 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -61,6 +61,8 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
+            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 0a527262f..51e813003 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -384,6 +384,72 @@ namespace MWClass
             ref->mBase = record;
     }
 
+    bool Weapon::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    {
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
+
+        // slots that this item can be equipped in
+        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
+
+        // retrieve ContainerStoreIterator to the item
+        MWWorld::ContainerStoreIterator it = invStore.begin();
+        for (; it != invStore.end(); ++it)
+        {
+            if (*it == item)
+            {
+                break;
+            }
+        }
+
+        assert(it != invStore.end());
+
+        std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
+
+        // equip the item in the first free slot
+        for (std::vector<int>::const_iterator slot=slots.first.begin();
+            slot!=slots.first.end(); ++slot)
+        {
+            if(*slot == MWWorld::InventoryStore::Slot_CarriedRight)
+            {
+               if (it.getType() == MWWorld::ContainerStore::Type_Weapon)
+                {
+                   if(it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
+                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
+                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
+                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
+                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
+                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
+                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+                 {
+                      //unequip lefthand item
+                     invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                 }
+              }
+          }
+          if(*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
+          {
+            MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+
+                if (weapon.getType() == MWWorld::ContainerStore::Type_Weapon)
+                {
+                    if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
+                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
+                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
+                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
+                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
+                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
+                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+                    {
+                        //unequip twohanded item
+                        invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
     boost::shared_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr) const
     {
         boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 4774bb50b..922cd165f 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -67,6 +67,8 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
+            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f60567c6c..89671ee08 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -36,8 +36,7 @@ namespace MWMechanics
     void Actors::updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused)
     {
         if (!paused && ptr.getRefData().getHandle()!="player")
-            MWWorld::Class::get (ptr).getInventoryStore (ptr).autoEquip (
-                MWWorld::Class::get (ptr).getNpcStats (ptr));
+            MWWorld::Class::get (ptr).getInventoryStore (ptr).autoEquip (ptr);
     }
 
     void Actors::adjustMagicEffects (const MWWorld::Ptr& creature)
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 9a44a9979..c147113fc 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -43,108 +43,8 @@ namespace MWWorld
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
-
-            // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
-            const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
-            if(race->mData.mFlags & ESM::Race::Beast)
-            {
-                if(*slot == MWWorld::InventoryStore::Slot_Helmet)
-                {
-                    std::vector<ESM::PartReference> parts;
-                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
-                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
-                    else
-                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
-
-                    bool allow = true;
-                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
-                    {
-                        if((*itr).mPart == ESM::PRT_Head)
-                        {
-                            if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
-                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
-
-                            allow = false;
-                            break;
-                        }
-                    }
-
-                    if(!allow)
-                        break;
-                }
-
-                if (*slot == MWWorld::InventoryStore::Slot_Boots)
-                {
-                    bool allow = true;
-                    std::vector<ESM::PartReference> parts;
-                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
-                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
-                    else
-                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
-                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
-                    {
-                        if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
-                        {
-                            allow = false;
-                            // Only notify the player, not npcs
-                            if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
-                            {
-                                if(it.getType() == MWWorld::ContainerStore::Type_Clothing){ // It's shoes
-                                    MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}");
-                                }
-
-                                else // It's boots
-                                {
-                                    MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}");
-                                }
-                            }
-                            break;
-                        }
-                    }
-
-                    if(!allow)
-                        break;
-                }
-
-            }
-
-            //Disable twohanded when shield equipped, shield when twohanded equipped
-            if(*slot == MWWorld::InventoryStore::Slot_CarriedRight)
-            {
-                if (it.getType() == MWWorld::ContainerStore::Type_Weapon)
-                {
-                    if(it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
-                    it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
-                    it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
-                    it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
-                    it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
-                    it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
-                    it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
-                    {
-                        //unequip lefthand item
-                        invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
-                    }
-                }
-            }
-            if(*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
-            {
-                ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-
-                if (weapon.getType() == MWWorld::ContainerStore::Type_Weapon)
-                {
-                    if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
-                    {
-                        //unequip twohanded item
-                        invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
-                    }
-                }
-            }
+            if(!MWWorld::Class::get(getTarget()).canEquip(actor,getTarget()))
+                break;
 
             // if all slots are occupied, replace the last slot
             if (slot == --slots.first.end())
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 2dfa241b3..ee2072cf0 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -259,6 +259,11 @@ namespace MWWorld
         throw std::runtime_error ("class can't be enchanted");
     }
 
+    bool Class::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    {
+        return true;
+    }
+
     void Class::adjustPosition(const MWWorld::Ptr& ptr) const
     {
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index de4741e38..4931da7a8 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -242,6 +242,9 @@ namespace MWWorld
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
+            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            ///< Return 0 if player cannot equip item. Unequip twohanded item if neccesary
+
             virtual Ptr
             copyToCell(const Ptr &ptr, CellStore &cell) const;
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index dd518ff6a..7a5ae38d0 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -128,8 +128,9 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
     return mSlots[slot];
 }
 
-void MWWorld::InventoryStore::autoEquip (const MWMechanics::NpcStats& stats)
+void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& npc)
 {
+    const MWMechanics::NpcStats& stats = MWWorld::Class::get(npc).getNpcStats(npc);
     TSlots slots;
     initSlots (slots);
 
@@ -183,6 +184,9 @@ void MWWorld::InventoryStore::autoEquip (const MWMechanics::NpcStats& stats)
                 }
             }
 
+            if(!MWWorld::Class::get (test).canEquip (npc, test))
+                continue;
+
             if (!itemsSlots.second) // if itemsSlots.second is true, item can stay stacked when equipped
             {
                 // unstack item pointed to by iterator if required
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index e55eca0ae..cc28a0a0c 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -78,7 +78,7 @@ namespace MWWorld
 
             ContainerStoreIterator getSlot (int slot);
 
-            void autoEquip (const MWMechanics::NpcStats& stats);
+            void autoEquip (const MWWorld::Ptr& npc);
             ///< Auto equip items according to stats and item value.
 
             const MWMechanics::MagicEffects& getMagicEffects();

From 50932a7a6bf52281aaa37242e53d0d84739a80ac Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Mon, 8 Apr 2013 17:50:03 +0200
Subject: [PATCH 02/10] Finished bugfix #691

---
 apps/openmw/mwclass/armor.cpp    | 47 ++++++++++++++------------------
 apps/openmw/mwclass/clothing.cpp | 31 ++++++++++++---------
 apps/openmw/mwclass/weapon.cpp   | 42 +++++++---------------------
 3 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 496e69545..f6392941d 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -321,15 +321,10 @@ namespace MWClass
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
             if(race->mData.mFlags & ESM::Race::Beast)
             {
+                std::vector<ESM::PartReference> parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+
                 if(*slot == MWWorld::InventoryStore::Slot_Helmet)
                 {
-                    std::vector<ESM::PartReference> parts;
-                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
-                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
-                    else
-                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
-
-                    bool allow = true;
                     for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
                     {
                         if((*itr).mPart == ESM::PRT_Head)
@@ -337,41 +332,41 @@ namespace MWClass
                             if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
 
-                            allow = false;
-                            break;
+                            return false;
                         }
                     }
-
-                    if(!allow)
-                        break;
                 }
 
                 if (*slot == MWWorld::InventoryStore::Slot_Boots)
                 {
-                    bool allow = true;
-                    std::vector<ESM::PartReference> parts;
-                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
-                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
-                    else
-                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
                     for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
                     {
                         if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
                         {
-                            allow = false;
-                            // Only notify the player, not npcs
                             if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
-                            {
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}");
-                            }
-                            break;
+                            return false;
                         }
                     }
-
-                    if(!allow)
-                        return false;
                 }
+            }
 
+            if(*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
+            {
+                MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+
+                if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
+                weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
+                weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
+                weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
+                weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
+                weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
+                weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+                {
+                    //unequip twohanded item
+                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+                }
+                return true;
             }
         }
         return true;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 77a7557bf..318515a7b 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -267,32 +267,37 @@ namespace MWClass
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
             if(race->mData.mFlags & ESM::Race::Beast)
             {
+                std::vector<ESM::PartReference> parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+
+                if(*slot == MWWorld::InventoryStore::Slot_Helmet)
+                {
+                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                    {
+                        if((*itr).mPart == ESM::PRT_Head)
+                        {
+                            if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
+
+                            return false;
+                        }
+                    }
+                }
+
                 if (*slot == MWWorld::InventoryStore::Slot_Boots)
                 {
-                    bool allow = true;
-                    std::vector<ESM::PartReference> parts;
-                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
-                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
-                    else
-                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
                     for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
                     {
                         if((*itr).mPart == ESM::PRT_LFoot || (*itr).mPart == ESM::PRT_RFoot)
                         {
-                            allow = false;
-                            // Only notify the player, not npcs
                             if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                             {
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}");
                             }
-                            break;
+
+                            return false;
                         }
                     }
-
-                    if(!allow)
-                        return false;
                 }
-
             }
         }
         return true;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 51e813003..a0a8b7e87 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -411,41 +411,19 @@ namespace MWClass
         {
             if(*slot == MWWorld::InventoryStore::Slot_CarriedRight)
             {
-               if (it.getType() == MWWorld::ContainerStore::Type_Weapon)
+                if(it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
+                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
+                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
+                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
+                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
+                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
+                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
                 {
-                   if(it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
-                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
-                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
-                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
-                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
-                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
-                   it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
-                 {
-                      //unequip lefthand item
-                     invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
-                 }
-              }
-          }
-          if(*slot == MWWorld::InventoryStore::Slot_CarriedLeft)
-          {
-            MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-
-                if (weapon.getType() == MWWorld::ContainerStore::Type_Weapon)
-                {
-                    if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
-                    weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
-                    {
-                        //unequip twohanded item
-                        invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
-                    }
+                    //unequip lefthand item
+                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
                 }
+                return true;
             }
-            return true;
         }
         return false;
     }

From 194ca2584dfced9e807c1c5865eb3b5600a723e0 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Mon, 8 Apr 2013 17:53:41 +0200
Subject: [PATCH 03/10] Small azura's star fix

---
 apps/openmw/mwmechanics/enchanting.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index d92acdafc..a38cb0037 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -53,14 +53,18 @@ namespace MWMechanics
 
     bool Enchanting::create()
     {
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         ESM::Enchantment enchantment;
         enchantment.mData.mCharge = getGemCharge();
 
-        //Exception for Azura Star, it's not destroyed after enchanting
+        mSoulGemPtr.getRefData().setCount (mSoulGemPtr.getRefData().getCount()-1);
+
+        //Exception for Azura Star, new one will be added after enchanting
         if(boost::iequals(mSoulGemPtr.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
-            mSoulGemPtr.getCellRef().mSoul="";
-        else
-            mSoulGemPtr.getRefData().setCount (mSoulGemPtr.getRefData().getCount()-1);
+        {
+            MWWorld::ManualRef azura (MWBase::Environment::get().getWorld()->getStore(), "Misc_SoulGem_Azura");
+            MWWorld::Class::get (player).getContainerStore (player).add (azura.getPtr());
+        }
 
         if(mSelfEnchanting)
         {
@@ -87,7 +91,6 @@ namespace MWMechanics
         MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), mOldItemId);
         ref.getPtr().getRefData().setCount (mOldItemCount-1);
 
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         MWWorld::Class::get (player).getContainerStore (player).add (ref.getPtr());
         if(!mSelfEnchanting)
             payForEnchantment();

From 7c22e123f4c6fb37f27f874749096a4b9a8b4558 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Mon, 8 Apr 2013 22:10:55 +0200
Subject: [PATCH 04/10] Bugfix #691 changes

---
 apps/openmw/mwclass/armor.cpp          | 27 +++++------------
 apps/openmw/mwclass/armor.hpp          |  3 +-
 apps/openmw/mwclass/clothing.cpp       | 24 ++++------------
 apps/openmw/mwclass/clothing.hpp       |  3 +-
 apps/openmw/mwclass/weapon.cpp         | 40 +++++++-------------------
 apps/openmw/mwclass/weapon.hpp         |  3 +-
 apps/openmw/mwworld/actionequip.cpp    | 11 +++++--
 apps/openmw/mwworld/class.cpp          |  4 +--
 apps/openmw/mwworld/class.hpp          |  4 +--
 apps/openmw/mwworld/inventorystore.cpp | 13 +++++++--
 10 files changed, 53 insertions(+), 79 deletions(-)

diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index f6392941d..ddab6f754 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -292,25 +292,13 @@ namespace MWClass
         ref->mBase = record;
     }
 
-    bool Armor::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Armor::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
     {
         MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
 
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
 
-        // retrieve ContainerStoreIterator to the item
-        MWWorld::ContainerStoreIterator it = invStore.begin();
-        for (; it != invStore.end(); ++it)
-        {
-            if (*it == item)
-            {
-                break;
-            }
-        }
-
-        assert(it != invStore.end());
-
         std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
 
         for (std::vector<int>::const_iterator slot=slots.first.begin();
@@ -321,7 +309,7 @@ namespace MWClass
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
             if(race->mData.mFlags & ESM::Race::Beast)
             {
-                std::vector<ESM::PartReference> parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+                std::vector<ESM::PartReference> parts = item.get<ESM::Armor>()->mBase->mParts.mParts;
 
                 if(*slot == MWWorld::InventoryStore::Slot_Helmet)
                 {
@@ -332,7 +320,7 @@ namespace MWClass
                             if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
 
-                            return false;
+                            return 0;
                         }
                     }
                 }
@@ -345,7 +333,7 @@ namespace MWClass
                         {
                             if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}");
-                            return false;
+                            return 0;
                         }
                     }
                 }
@@ -363,13 +351,12 @@ namespace MWClass
                 weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
                 weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
                 {
-                    //unequip twohanded item
-                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+                    return 3;
                 }
-                return true;
+                return 1;
             }
         }
-        return true;
+        return 1;
     }
 
     boost::shared_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index bb07e42b0..96c72848c 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -67,7 +67,8 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 318515a7b..58c4a2c5c 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -238,25 +238,11 @@ namespace MWClass
         ref->mBase = record;
     }
 
-    bool Clothing::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Clothing::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
     {
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
-
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
 
-        // retrieve ContainerStoreIterator to the item
-        MWWorld::ContainerStoreIterator it = invStore.begin();
-        for (; it != invStore.end(); ++it)
-        {
-            if (*it == item)
-            {
-                break;
-            }
-        }
-
-        assert(it != invStore.end());
-
         std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
 
         for (std::vector<int>::const_iterator slot=slots.first.begin();
@@ -267,7 +253,7 @@ namespace MWClass
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
             if(race->mData.mFlags & ESM::Race::Beast)
             {
-                std::vector<ESM::PartReference> parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+                std::vector<ESM::PartReference> parts = item.get<ESM::Clothing>()->mBase->mParts.mParts;
 
                 if(*slot == MWWorld::InventoryStore::Slot_Helmet)
                 {
@@ -278,7 +264,7 @@ namespace MWClass
                             if(npc == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
 
-                            return false;
+                            return 0;
                         }
                     }
                 }
@@ -294,13 +280,13 @@ namespace MWClass
                                 MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}");
                             }
 
-                            return false;
+                            return 0;
                         }
                     }
                 }
             }
         }
-        return true;
+        return 1;
     }
 
     boost::shared_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 4978fa228..eb8d80199 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -61,7 +61,8 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index a0a8b7e87..a0cacaf6b 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -384,48 +384,30 @@ namespace MWClass
             ref->mBase = record;
     }
 
-    bool Weapon::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Weapon::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
     {
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
-
-        // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
 
-        // retrieve ContainerStoreIterator to the item
-        MWWorld::ContainerStoreIterator it = invStore.begin();
-        for (; it != invStore.end(); ++it)
-        {
-            if (*it == item)
-            {
-                break;
-            }
-        }
-
-        assert(it != invStore.end());
-
-        std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
-
         // equip the item in the first free slot
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
             if(*slot == MWWorld::InventoryStore::Slot_CarriedRight)
             {
-                if(it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
-                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
-                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
-                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
-                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
-                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
-                it->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+                if(item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
+                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
                 {
-                    //unequip lefthand item
-                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                    return 2;
                 }
-                return true;
+                return 1;
             }
         }
-        return false;
+        return 0;
     }
 
     boost::shared_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 922cd165f..01686b09c 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -67,7 +67,8 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index c147113fc..51d0de6fe 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -43,8 +43,15 @@ namespace MWWorld
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
-            if(!MWWorld::Class::get(getTarget()).canEquip(actor,getTarget()))
-                break;
+            switch(MWWorld::Class::get (*it).canBeEquipped (actor, *it))
+            {
+                case 0:
+                    return;
+                case 2:
+                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                case 3:
+                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+            }
 
             // if all slots are occupied, replace the last slot
             if (slot == --slots.first.end())
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index ee2072cf0..a0067f5d2 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -259,9 +259,9 @@ namespace MWWorld
         throw std::runtime_error ("class can't be enchanted");
     }
 
-    bool Class::canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Class::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
     {
-        return true;
+        return 1;
     }
 
     void Class::adjustPosition(const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 4931da7a8..362a8bc9c 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -242,8 +242,8 @@ namespace MWWorld
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual bool canEquip(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
-            ///< Return 0 if player cannot equip item. Unequip twohanded item if neccesary
+            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual Ptr
             copyToCell(const Ptr &ptr, CellStore &cell) const;
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 7a5ae38d0..9f51db353 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -131,6 +131,8 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
 void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& npc)
 {
     const MWMechanics::NpcStats& stats = MWWorld::Class::get(npc).getNpcStats(npc);
+    MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
+
     TSlots slots;
     initSlots (slots);
 
@@ -184,8 +186,15 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& npc)
                 }
             }
 
-            if(!MWWorld::Class::get (test).canEquip (npc, test))
-                continue;
+            switch(MWWorld::Class::get (test).canBeEquipped (npc, test))
+            {
+                case 0:
+                    continue;
+                case 2:
+                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                case 3:
+                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+            }
 
             if (!itemsSlots.second) // if itemsSlots.second is true, item can stay stacked when equipped
             {

From 623c2c8201c80857bbaefe4278b04e88cdda269b Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Tue, 9 Apr 2013 07:45:07 +0200
Subject: [PATCH 05/10] Minor fix

---
 apps/openmw/mwworld/actionequip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 51d0de6fe..d5927b6c5 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -43,7 +43,7 @@ namespace MWWorld
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
-            switch(MWWorld::Class::get (*it).canBeEquipped (actor, *it))
+            switch(MWWorld::Class::get (getTarget()).canBeEquipped (actor, getTarget()))
             {
                 case 0:
                     return;

From 46925e93a6f79402f0838eabab30f02c4352a828 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Tue, 9 Apr 2013 16:14:08 +0200
Subject: [PATCH 06/10] Second minor fix

---
 apps/openmw/mwclass/armor.cpp       | 3 +++
 apps/openmw/mwworld/actionequip.cpp | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index ddab6f754..a14b2667e 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -343,6 +343,9 @@ namespace MWClass
             {
                 MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
 
+                if(weapon == invStore.end())
+                    return 1;
+
                 if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
                 weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
                 weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index d5927b6c5..82431ac8f 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -18,6 +18,7 @@ namespace MWWorld
 
     void ActionEquip::executeImp (const Ptr& actor)
     {
+        MWWorld::Ptr object = getTarget();
         MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
 
         // slots that this item can be equipped in
@@ -27,7 +28,7 @@ namespace MWWorld
         MWWorld::ContainerStoreIterator it = invStore.begin();
         for (; it != invStore.end(); ++it)
         {
-            if (*it == getTarget())
+            if (*it == object)
             {
                 break;
             }
@@ -43,7 +44,7 @@ namespace MWWorld
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
-            switch(MWWorld::Class::get (getTarget()).canBeEquipped (actor, getTarget()))
+            switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
             {
                 case 0:
                     return;
@@ -70,10 +71,10 @@ namespace MWWorld
             }
         }
 
-        std::string script = MWWorld::Class::get(*it).getScript(*it);
+        std::string script = MWWorld::Class::get(object).getScript(object);
         
         /* Set OnPCEquip Variable on item's script, if the player is equipping it, and it has a script with that variable declared */
         if(equipped && actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() && script != "")
-            (*it).mRefData->getLocals().setVarByInt(script, "onpcequip", 1);
+            (object).mRefData->getLocals().setVarByInt(script, "onpcequip", 1);
     }
 }

From 44ef02eb99c2cf7f4cab6d60320e155fe5183579 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Tue, 9 Apr 2013 19:04:59 +0200
Subject: [PATCH 07/10] Third minor fix

---
 apps/openmw/mwworld/actionequip.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 82431ac8f..2877a2c5a 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -40,19 +40,20 @@ namespace MWWorld
 
         bool equipped = false;
 
+        switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
+        {
+            case 0:
+                return; //Item cannot be equipped, so function breaks.
+            case 2:
+                invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+            case 3:
+                invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+        }
+
         // equip the item in the first free slot
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
-            switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
-            {
-                case 0:
-                    return;
-                case 2:
-                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
-                case 3:
-                    invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
-            }
 
             // if all slots are occupied, replace the last slot
             if (slot == --slots.first.end())

From 248fff6eb7323b7c7cf4f56afff53c1b820e6fb3 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Tue, 9 Apr 2013 19:41:03 +0200
Subject: [PATCH 08/10] Fourth minor fix

---
 apps/openmw/mwworld/actionequip.cpp    | 4 +++-
 apps/openmw/mwworld/inventorystore.cpp | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 2877a2c5a..39c5abe34 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -43,11 +43,13 @@ namespace MWWorld
         switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
         {
             case 0:
-                return; //Item cannot be equipped, so function breaks.
+                return;
             case 2:
                 invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                break;
             case 3:
                 invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+                break;
         }
 
         // equip the item in the first free slot
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 9f51db353..782e3f920 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -192,8 +192,10 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& npc)
                     continue;
                 case 2:
                     invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                    break;
                 case 3:
                     invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+                    break;
             }
 
             if (!itemsSlots.second) // if itemsSlots.second is true, item can stay stacked when equipped

From bd93e63150dc69c0e3caf27231dfbede99772baf Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Tue, 9 Apr 2013 19:46:27 +0200
Subject: [PATCH 09/10] Fifth minor fix

---
 apps/openmw/mwworld/actionequip.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 39c5abe34..fd35d0dd3 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -21,6 +21,18 @@ namespace MWWorld
         MWWorld::Ptr object = getTarget();
         MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
 
+        switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
+        {
+            case 0:
+                return;
+            case 2:
+                invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
+                break;
+            case 3:
+                invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
+                break;
+        }
+
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(getTarget()).getEquipmentSlots(getTarget());
 
@@ -40,18 +52,6 @@ namespace MWWorld
 
         bool equipped = false;
 
-        switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
-        {
-            case 0:
-                return;
-            case 2:
-                invStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, invStore.end());
-                break;
-            case 3:
-                invStore.equip(MWWorld::InventoryStore::Slot_CarriedRight, invStore.end());
-                break;
-        }
-
         // equip the item in the first free slot
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)

From ad49d1ecab8be0fdd863a5f747f5a680bf1fdc5a Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Wed, 10 Apr 2013 15:24:20 +0200
Subject: [PATCH 10/10] Sixth minor fix

---
 apps/openmw/mwclass/armor.cpp          |  6 +++---
 apps/openmw/mwclass/armor.hpp          |  2 +-
 apps/openmw/mwclass/clothing.cpp       |  6 +++---
 apps/openmw/mwclass/clothing.hpp       |  2 +-
 apps/openmw/mwclass/weapon.cpp         | 18 +++++++++---------
 apps/openmw/mwclass/weapon.hpp         |  2 +-
 apps/openmw/mwworld/actionequip.cpp    |  2 +-
 apps/openmw/mwworld/class.cpp          |  2 +-
 apps/openmw/mwworld/class.hpp          |  2 +-
 apps/openmw/mwworld/inventorystore.cpp |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index a14b2667e..d257c8761 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -292,12 +292,12 @@ namespace MWClass
         ref->mBase = record;
     }
 
-    int Armor::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Armor::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
     {
         MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
 
         // slots that this item can be equipped in
-        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
+        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(ptr).getEquipmentSlots(ptr);
 
         std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
 
@@ -309,7 +309,7 @@ namespace MWClass
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
             if(race->mData.mFlags & ESM::Race::Beast)
             {
-                std::vector<ESM::PartReference> parts = item.get<ESM::Armor>()->mBase->mParts.mParts;
+                std::vector<ESM::PartReference> parts = ptr.get<ESM::Armor>()->mBase->mParts.mParts;
 
                 if(*slot == MWWorld::InventoryStore::Slot_Helmet)
                 {
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 96c72848c..1b99e5133 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -67,7 +67,7 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const;
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 58c4a2c5c..b4e6e61f6 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -238,10 +238,10 @@ namespace MWClass
         ref->mBase = record;
     }
 
-    int Clothing::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Clothing::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
     {
         // slots that this item can be equipped in
-        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
+        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(ptr).getEquipmentSlots(ptr);
 
         std::string npcRace = npc.get<ESM::NPC>()->mBase->mRace;
 
@@ -253,7 +253,7 @@ namespace MWClass
             const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npcRace);
             if(race->mData.mFlags & ESM::Race::Beast)
             {
-                std::vector<ESM::PartReference> parts = item.get<ESM::Clothing>()->mBase->mParts.mParts;
+                std::vector<ESM::PartReference> parts = ptr.get<ESM::Clothing>()->mBase->mParts.mParts;
 
                 if(*slot == MWWorld::InventoryStore::Slot_Helmet)
                 {
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index eb8d80199..71e01e818 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -61,7 +61,7 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const;
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index a0cacaf6b..e534a65c2 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -384,9 +384,9 @@ namespace MWClass
             ref->mBase = record;
     }
 
-    int Weapon::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Weapon::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
     {
-        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(item).getEquipmentSlots(item);
+        std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(ptr).getEquipmentSlots(ptr);
 
         // equip the item in the first free slot
         for (std::vector<int>::const_iterator slot=slots.first.begin();
@@ -394,13 +394,13 @@ namespace MWClass
         {
             if(*slot == MWWorld::InventoryStore::Slot_CarriedRight)
             {
-                if(item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
-                item.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
+                if(ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
+                ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || 
+                ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || 
+                ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::SpearTwoWide ||
+                ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::AxeTwoHand || 
+                ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanBow || 
+                ptr.get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::MarksmanCrossbow)
                 {
                     return 2;
                 }
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 01686b09c..6c3f32abe 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -67,7 +67,7 @@ namespace MWClass
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const;
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index fd35d0dd3..84d1a3d15 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -21,7 +21,7 @@ namespace MWWorld
         MWWorld::Ptr object = getTarget();
         MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
 
-        switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
+        switch(MWWorld::Class::get (object).canBeEquipped (object, actor))
         {
             case 0:
                 return;
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index a0067f5d2..d7ff35014 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -259,7 +259,7 @@ namespace MWWorld
         throw std::runtime_error ("class can't be enchanted");
     }
 
-    int Class::canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const
+    int Class::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
     {
         return 1;
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 362a8bc9c..484004aca 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -242,7 +242,7 @@ namespace MWWorld
 
             virtual void applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
 
-            virtual int canBeEquipped(const MWWorld::Ptr &npc, const MWWorld::Ptr &item) const;
+            virtual int canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const;
             ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
 
             virtual Ptr
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 782e3f920..5495d6a02 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -186,7 +186,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& npc)
                 }
             }
 
-            switch(MWWorld::Class::get (test).canBeEquipped (npc, test))
+            switch(MWWorld::Class::get (test).canBeEquipped (test, npc))
             {
                 case 0:
                     continue;