diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp index 5bbf74e269..cf88efaaed 100644 --- a/apps/openmw/mwgui/itemmodel.cpp +++ b/apps/openmw/mwgui/itemmodel.cpp @@ -32,26 +32,6 @@ namespace MWGui { } - bool ItemStack::stacks(const ItemStack &other) - { - if(mBase == other.mBase) - return true; - - // If one of the items is in an inventory and currently equipped, we need to check stacking both ways to be sure - if (mBase.getContainerStore() && other.mBase.getContainerStore()) - return mBase.getContainerStore()->stacks(mBase, other.mBase) - && other.mBase.getContainerStore()->stacks(mBase, other.mBase); - - if (mBase.getContainerStore()) - return mBase.getContainerStore()->stacks(mBase, other.mBase); - if (other.mBase.getContainerStore()) - return other.mBase.getContainerStore()->stacks(mBase, other.mBase); - - MWWorld::ContainerStore store; - return store.stacks(mBase, other.mBase); - - } - bool operator == (const ItemStack& left, const ItemStack& right) { if (left.mType != right.mType) diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp index 36432d4797..4d923bae34 100644 --- a/apps/openmw/mwgui/itemmodel.hpp +++ b/apps/openmw/mwgui/itemmodel.hpp @@ -13,7 +13,6 @@ namespace MWGui { ItemStack (const MWWorld::Ptr& base, ItemModel* creator, size_t count); ItemStack(); - bool stacks (const ItemStack& other); ///< like operator==, only without checking mType enum Type