mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 16:06:44 +00:00
Code Issues Releases Wiki Activity

some cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2011-05-30 14:27:04 +02:00
parent bed45a936e
commit 7d2956329a
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@ ExteriorCellRender::ExteriorCellRender(ESMS::CellStore<MWWorld::RefData> &_cell,
: mCell(_cell), mEnvironment (environment), mScene(_scene), mBase(NULL), mInsert(NULL), mAmbientMode (0) : mCell(_cell), mEnvironment (environment), mScene(_scene), mBase(NULL), mInsert(NULL), mAmbientMode (0)
{ {
uniqueID = uniqueID +1; uniqueID = uniqueID +1;
sg = Ogre::Root::getSingleton().getSceneManagerIterator().getNext()->createStaticGeometry( "sg" + Ogre::StringConverter::toString(uniqueID)); sg = mScene.getMgr()->createStaticGeometry( "sg" + Ogre::StringConverter::toString(uniqueID));
} }
@ -400,11 +400,11 @@ void ExteriorCellRender::destroy()
mScene.getMgr()->destroySceneNode(mBase); mScene.getMgr()->destroySceneNode(mBase);
} }
mBase = NULL; mBase = 0;
std::cout << "destroy";
if (sg) if (sg)
{ {
Ogre::Root::getSingleton().getSceneManagerIterator().getNext()->destroyStaticGeometry(sg); mScene.getMgr()->destroyStaticGeometry (sg);
sg = 0; sg = 0;
} }
} }

1
apps/openmw/mwworld/world.cpp
View file

@ -284,7 +284,6 @@ namespace MWWorld
removeScripts (iter->first); removeScripts (iter->first);
mEnvironment.mMechanicsManager->dropActors (iter->first); mEnvironment.mMechanicsManager->dropActors (iter->first);
iter->second->destroy();
mEnvironment.mSoundManager->stopSound (iter->first); mEnvironment.mSoundManager->stopSound (iter->first);
delete iter->second; delete iter->second;
mActiveCells.erase (iter); mActiveCells.erase (iter);