From d341d2113c8585093781f3c6975b3d7c3b1fabd4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 13 May 2012 14:58:38 +0200
Subject: [PATCH] fixed some issues

---
 apps/openmw/mwworld/containerstore.cpp |  2 +-
 apps/openmw/mwworld/containerstore.hpp |  7 ++++---
 apps/openmw/mwworld/inventorystore.cpp | 22 ++++++++++++++++++++--
 apps/openmw/mwworld/inventorystore.hpp |  7 +++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 94df222d4..dcddc333b 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -49,7 +49,7 @@ bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2) const
 {
     /// \todo add current weapon/armor health, remaining lockpick/repair uses, current enchantment charge here as soon as they are implemented
     if (  ptr1.mCellRef->refID == ptr2.mCellRef->refID
-        && (MWWorld::Class::get(ptr1).getScript(ptr1) == "" && MWWorld::Class::get(ptr2).getScript(ptr2) == "") // item with a script never stacks
+        && MWWorld::Class::get(ptr1).getScript(ptr1) == "" // item with a script never stacks
         && ptr1.mCellRef->owner == ptr2.mCellRef->owner
         && ptr1.mCellRef->soul == ptr2.mCellRef->soul
         && ptr1.mCellRef->charge == ptr2.mCellRef->charge)
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 9b9d29c57..f0e9d7e4a 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -66,9 +66,6 @@ namespace MWWorld
 
             ContainerStoreIterator end();
 
-            bool stacks (const Ptr& ptr1, const Ptr& ptr2) const;
-            ///< @return true if the two specified objects can stack with each other
-
             void add (const Ptr& ptr);
             ///< Add the item pointed to by \a ptr to this container. (Stacks automatically if needed)
             ///
@@ -81,6 +78,10 @@ namespace MWWorld
             void addImpl (const Ptr& ptr);
             ///< Add the item to this container (no stacking)
 
+            virtual bool stacks (const Ptr& ptr1, const Ptr& ptr2) const;
+            ///< @return true if the two specified objects can stack with each other
+            /// @note ptr1 is the item that is already in this container
+
         public:
 
             void fill (const ESM::InventoryList& items, const ESMS::ESMStore& store);
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index ea295e903..6cf35ac64 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -59,9 +59,10 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
     if (iterator.getContainerStore()!=this)
         throw std::runtime_error ("attempt to equip an item that is not in the inventory");
 
+    std::pair<std::vector<int>, bool> slots;
     if (iterator!=end())
     {
-        std::pair<std::vector<int>, bool> slots = Class::get (*iterator).getEquipmentSlots (*iterator);
+        slots = Class::get (*iterator).getEquipmentSlots (*iterator);
 
         if (std::find (slots.first.begin(), slots.first.end(), slot)==slots.first.end())
             throw std::runtime_error ("invalid slot");
@@ -82,7 +83,7 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
     }
 
     // unstack item pointed to by iterator if required
-    if (iterator->getRefData().getCount() > 1)
+    if (iterator!=end() && !slots.second && iterator->getRefData().getCount() > 1) // if slots.second is true, item can stay stacked when equipped
     {
         // add the item again with a count of count-1, then set the count of the original (that will be equipped) to 1
         int count = iterator->getRefData().getCount();
@@ -199,3 +200,20 @@ void MWWorld::InventoryStore::autoEquip (const MWMechanics::NpcStats& stats)
         flagAsModified();
     }
 }
+
+bool MWWorld::InventoryStore::stacks(const Ptr& ptr1, const Ptr& ptr2) const
+{
+    bool canStack = MWWorld::ContainerStore::stacks(ptr1, ptr2);
+    if (!canStack)
+        return false;
+
+    // don't stack if the item being checked against is currently equipped.
+    for (TSlots::const_iterator iter (mSlots.begin());
+        iter!=mSlots.end(); ++iter)
+    {
+        if (ptr1 == **iter)
+            return false;
+    }
+
+    return true;
+}
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 5eeaf570d..4162c7e2e 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -64,6 +64,13 @@ namespace MWWorld
 
             void autoEquip (const MWMechanics::NpcStats& stats);
             ///< Auto equip items according to stats and item value.
+
+        protected:
+
+            virtual bool stacks (const Ptr& ptr1, const Ptr& ptr2) const;
+            ///< @return true if the two specified objects can stack with each other
+            /// @note ptr1 is the item that is already in this container
+
     };
 }