Changeset 3989 in orxonox.OLD for orxonox/branches/ll2trunktemp/src/story_entities/world.cc

Timestamp:

Apr 27, 2005, 1:21:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/ll2trunktemp: some more headers, now the level really gets loaded

File:

• orxonox/branches/ll2trunktemp/src/story_entities/world.cc (modified) (9 diffs)

orxonox/branches/ll2trunktemp/src/story_entities/world.cc

@@ -118 +118 @@
 World::World( TiXmlElement* root)
 {
+  this->constuctorInit("", -1);
+
         const char *string;
         char *name;
@@ -148 +150 @@
         
   this->localPlayer = NULL;
-  this->entities = new tList<WorldEntity>();
-        
-
-  this->setClassName ("World");
+
 }
 
@@ -161 +160 @@
 World::World (char* name)
 {
-  this->init(name, -1);
+  this->constuctorInit(name, -1);
   //NullParent* np = NullParent::getInstance();
 }
@@ -171 +170 @@
 World::World (int worldID)
 {
-  this->init(NULL, worldID);
+  this->constuctorInit(NULL, worldID);
 }
 
@@ -216 +215 @@
    NO LEVEL LOADING HERE - NEVER!
 */
-void World::init(char* name, int worldID)
+void World::constuctorInit(char* name, int worldID)
 {
   this->setClassName ("World");
@@ -225 +224 @@
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
-  AnimationPlayer::getInstance(); // initializes the animationPlayer
 }
 
@@ -241 +239 @@
   wi->init(this);
   this->garbageCollector = GarbageCollector::getInstance();
+  AnimationPlayer::getInstance(); // initializes the animationPlayer
+
+  this->nullParent = NullParent::getInstance();
 }
 
@@ -376 +377 @@
  
       // initializing the TrackManager
-      trackManager = TrackManager::getInstance();
+  this->trackManager = TrackManager::getInstance();
       //trackManager->addPoint(Vector(0,0,0));
       trackManager->addPoint(Vector(150, -35, 5));
@@ -838 +839 @@
       
       /* update tick the rest */
-      this->trackManager->tick(this->dt);
-      this->localCamera->tick(this->dt);
+      //      this->trackManager->tick(this->dt);
+      //      this->localCamera->tick(this->dt);
       this->garbageCollector->tick(seconds);