Changeset 6121 in orxonox.OLD for branches/objectmanager/src/story_entities/world.cc

Timestamp:

Dec 15, 2005, 1:34:32 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: packing the first entities into their lists

File:

• branches/objectmanager/src/story_entities/world.cc (modified) (2 diffs)

branches/objectmanager/src/story_entities/world.cc

@@ -141 +141 @@
   SoundEngine::getInstance()->flushAllSources();
 
-  delete ObjectManager::getInstance();
+  if (State::getObjectManager() == &this->objectManager)
+    State::setObjectManager(NULL);
   // erease everything that is left.
   delete PNode::getNullParent();
@@ -214 +215 @@
 ErrorMessage World::preLoad()
 {
+  State::setObjectManager(&this->objectManager);
   State::setWorldEntityList(this->entities = new tList<WorldEntity>());
   this->cycle = 0;