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

[Client] Disable mListener methods in mwworld/containerstore

Browse source 
This should put an end to frequent crashes until I can fix the problem properly.
This commit is contained in:
David Cernat 2018-10-27 02:19:45 +03:00
parent 1baf82db32
commit c65d6c1328
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
apps/openmw/mwworld/containerstore.cpp
View file

@ -366,8 +366,18 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
item.getRefData().getLocals().setVarByInt(script, "onpcadd", 1);
}
if (mListener)
mListener->itemAdded(item, count);
/*
Start of tes3mp change (major)
Disable the listener here because it keeps causing crashes; this should only be
a temporary solution that doesn't affect much anyway given that the listener is
only used in relation to light-emitting items
*/
//if (mListener)
// mListener->itemAdded(item, count);
/*
End of tes3mp change (major)
*/
return it;
}
@ -493,8 +503,18 @@ int MWWorld::ContainerStore::remove(const Ptr& item, int count, const Ptr& actor
flagAsModified();
if (mListener)
mListener->itemRemoved(item, count - toRemove);
/*
Start of tes3mp change (major)
Disable the listener here because it keeps causing crashes; this should only be
a temporary solution that doesn't affect much anyway given that the listener is
only used in relation to light-emitting items
*/
//if (mListener)
// mListener->itemRemoved(item, count - toRemove);
/*
End of tes3mp change (major)
*/
// number of removed items
return count - toRemove;