ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix leak

Browse Source
This commit is contained in:
Marianne Gagnon 2014-08-20 20:38:05 -04:00
parent d968ce11bf
commit c8b50c67ef
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modes/world.cpp
View File

@ -391,6 +391,8 @@ World::~World()
music_manager->stopMusic(); music_manager->stopMusic();
m_world = NULL; m_world = NULL;
irr_driver->getSceneManager()->clear();
#ifdef DEBUG #ifdef DEBUG
m_magic_number = 0xDEADBEEF; m_magic_number = 0xDEADBEEF;
#endif #endif

5
src/tracks/track.cpp
View File

@ -425,7 +425,6 @@ void Track::cleanup()
} }
#endif #endif
} // if verbose } // if verbose
} // cleanup } // cleanup
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2020,11 +2019,15 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
} }
scene::ISceneNode* parent = irr_driver->getSceneManager()->addEmptySceneNode(); scene::ISceneNode* parent = irr_driver->getSceneManager()->addEmptySceneNode();
#ifdef DEBUG
parent->setName(("libnode_" + name).c_str());
#endif
parent->setPosition(xyz); parent->setPosition(xyz);
parent->setRotation(hpr); parent->setRotation(hpr);
parent->setScale(scale); parent->setScale(scale);
parent->updateAbsolutePosition(); parent->updateAbsolutePosition();
loadObjects(libroot, lib_path, model_def_loader, create_lod_definitions, parent, library_nodes); loadObjects(libroot, lib_path, model_def_loader, create_lod_definitions, parent, library_nodes);
//m_all_nodes.push_back(parent);
} }
else if (name == "water") else if (name == "water")
{ {