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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: packing the first entities into their lists

Location:

branches/objectmanager/src/story_entities

Files:

• world.cc (modified) (2 diffs)
• world.h (modified) (3 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;

branches/objectmanager/src/story_entities/world.h

@@ -11 +11 @@
 #include "story_entity.h"
 #include "p_node.h"
+#include "object_manager.h"
 
-class World;
+
 class WorldEntity;
 class Camera;
@@ -18 +19 @@
 class GLMenuImageScreen;
 class Terrain;
-class GarbageCollector;
-class Text;
 class TiXmlElement;
 
 class Shell;
 class OggPlayer;
+
 template<class T> class tList;
 
@@ -104 +104 @@
     bool bPause;                        //!< pause mode
 
+    ObjectManager      objectManager;   //!< The ObjectManager of this World.
+
     GLMenuImageScreen* glmis;           //!< The Level-Loader Display