AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-26 14:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-05-24 13:26:07 +02:00
parent c0ee382c72
commit 684208dfc9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwworld/world.cpp
View File

@ -553,16 +553,17 @@ namespace MWWorld
{ {
ptr.getRefData().setCount (0); ptr.getRefData().setCount (0);
if (mWorldScene->getActiveCells().find (ptr.getCell())!=mWorldScene->getActiveCells().end())
{
MWBase::Environment::get().getMechanicsManager()->removeActor (ptr);
if (mWorldScene->getActiveCells().find (ptr.getCell())!=mWorldScene->getActiveCells().end()){ MWBase::Environment::get().getSoundManager()->stopSound3D (ptr);
// Class::get (ptr).disable (ptr, mEnvironment); /// \todo this line needs to be removed
MWBase::Environment::get().getSoundManager()->stopSound3D (ptr);
mPhysics->removeObject (ptr.getRefData().getHandle()); mPhysics->removeObject (ptr.getRefData().getHandle());
mRendering->removeObject(ptr); mRendering->removeObject(ptr);
mLocalScripts.remove (ptr); mLocalScripts.remove (ptr);
} }
} }
} }