mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 22:15:37 +00:00
Code Issues Releases Wiki Activity

Merge branch 'vengeful_dremora_protection' into 'master'

Browse source 
Unset store listeners for creatures

See merge request OpenMW/openmw!1402
This commit is contained in:
Alexei Kotov 2021-11-15 23:34:33 +00:00
commit 37c27ce072
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwrender/objects.cpp
View file

@ -141,11 +141,11 @@ void Objects::removeCell(const MWWorld::CellStore* store)
MWWorld::Ptr ptr = iter->second->getPtr();
if(ptr.getCell() == store)
{
if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData())
if (ptr.getClass().isActor() && ptr.getRefData().getCustomData())
{
MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
invStore.setInvListener(nullptr, ptr);
invStore.setContListener(nullptr);
if (ptr.getClass().hasInventoryStore(ptr))
ptr.getClass().getInventoryStore(ptr).setInvListener(nullptr, ptr);
ptr.getClass().getContainerStore(ptr).setContListener(nullptr);
}
mObjects.erase(iter++);