krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix bad override

Browse source
This commit is contained in:
scrawl 2017-03-08 01:28:56 +01:00
parent 21aad00612
commit 809f5cd01b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwworld/inventorystore.cpp
View file

@ -623,7 +623,7 @@ void MWWorld::InventoryStore::flagAsModified()
mRechargingItemsUpToDate = false; mRechargingItemsUpToDate = false;
} }
bool MWWorld::InventoryStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2) bool MWWorld::InventoryStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2) const
{ {
bool canStack = MWWorld::ContainerStore::stacks(ptr1, ptr2); bool canStack = MWWorld::ContainerStore::stacks(ptr1, ptr2);
if (!canStack) if (!canStack)

2
apps/openmw/mwworld/inventorystore.hpp
View file

@ -174,7 +174,7 @@ namespace MWWorld
///< \attention This function is internal to the world model and should not be called from ///< \attention This function is internal to the world model and should not be called from
/// outside. /// outside.
virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2); virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2) const;
///< @return true if the two specified objects can stack with each other ///< @return true if the two specified objects can stack with each other
virtual int remove(const Ptr& item, int count, const Ptr& actor); virtual int remove(const Ptr& item, int count, const Ptr& actor);