mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Code Issues Releases Wiki Activity

Fix the inventory listener bug

Browse source
This commit is contained in:
scrawl 2015-06-07 16:50:34 +02:00
parent e66e9916db
commit b33fe8fb62
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/npcanimation.cpp
View file

@ -231,7 +231,7 @@ NpcAnimation::~NpcAnimation()
// No need to getInventoryStore() to reset, if none exists // No need to getInventoryStore() to reset, if none exists
// This is to avoid triggering the listener via ensureCustomData()->autoEquip()->fireEquipmentChanged() // This is to avoid triggering the listener via ensureCustomData()->autoEquip()->fireEquipmentChanged()
// all from within this destructor. ouch! // all from within this destructor. ouch!
&& mPtr.getRefData().getCustomData()) && mPtr.getRefData().getCustomData() && mPtr.getClass().getInventoryStore(mPtr).getListener() == this)
mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr); mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr);
} }

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

@ -573,6 +573,11 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItem(const MWWor
throw std::runtime_error ("attempt to unequip an item that is not currently equipped"); throw std::runtime_error ("attempt to unequip an item that is not currently equipped");
} }
MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getListener()
{
return mListener;
}
void MWWorld::InventoryStore::setListener(InventoryStoreListener *listener, const Ptr& actor) void MWWorld::InventoryStore::setListener(InventoryStoreListener *listener, const Ptr& actor)
{ {
mListener = listener; mListener = listener;

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

@ -192,6 +192,8 @@ namespace MWWorld
void setListener (InventoryStoreListener* listener, const Ptr& actor); void setListener (InventoryStoreListener* listener, const Ptr& actor);
///< Set a listener for various events, see \a InventoryStoreListener ///< Set a listener for various events, see \a InventoryStoreListener
InventoryStoreListener* getListener();
void visitEffectSources (MWMechanics::EffectSourceVisitor& visitor); void visitEffectSources (MWMechanics::EffectSourceVisitor& visitor);
void rechargeItems (float duration); void rechargeItems (float duration);