Changeset 6407 in orxonox.OLD for branches/network/src/story_entities/game_world.cc

Timestamp:

Jan 4, 2006, 3:40:30 PM (18 years ago)

Author:

patrick

Message:

network: the worlds get loaded again in the new framework

File:

• branches/network/src/story_entities/game_world.cc (modified) (11 diffs)

branches/network/src/story_entities/game_world.cc

@@ -90 +90 @@
   this->path = NULL;
 
-  this->gameWorldData = new GameWorldData();
+  //this->dataTank = new GameWorldData();
 }
 
@@ -101 +101 @@
 GameWorld::~GameWorld ()
 {
-  if( this->gameWorldData)
-    delete this->gameWorldData;
+  if( this->dataTank)
+    delete this->dataTank;
 
   PRINTF(0)("Deleted GameWorld\n");
@@ -136 +136 @@
   this->shell = new Shell();
 
-  this->gameWorldData->init();
+  this->dataTank->init();
 }
 
@@ -146 +146 @@
 {
   this->displayLoadScreen();
+
+  PRINTF(0)("Loading the GameWorld\n");
 
   PRINTF(3)("> Loading world: '%s'\n", getPath());
@@ -176 +178 @@
   }
   /* the whole loading process for the GameWorld */
-  this->gameWorldData->loadData(root);
+  this->dataTank->loadData(root);
 
   delete XMLDoc;
@@ -191 +193 @@
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
-  this->gameWorldData->unloadData();
+  this->dataTank->unloadData();
 }
 
@@ -330 +332 @@
     this->gameTime += this->dtS;
 
-    this->tick(this->gameWorldData->objectManager->getObjectList(OM_DEAD_TICK), this->dtS);
-    this->tick(this->gameWorldData->objectManager->getObjectList(OM_COMMON), this->dtS);
-    this->tick(this->gameWorldData->objectManager->getObjectList(OM_GROUP_00), this->dtS);
-    this->tick(this->gameWorldData->objectManager->getObjectList(OM_GROUP_01), this->dtS);
-    this->tick(this->gameWorldData->objectManager->getObjectList(OM_GROUP_01_PROJ), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_DEAD_TICK), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_COMMON), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_00), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_01), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ), this->dtS);
 
     /* update tick the rest */
-    this->gameWorldData->localCamera->tick(this->dtS);
+    this->dataTank->localCamera->tick(this->dtS);
     AnimationPlayer::getInstance()->tick(this->dtS);
     ParticleEngine::getInstance()->tick(this->dtS);
@@ -368 +370 @@
 void GameWorld::collide()
 {
-  CDEngine::getInstance()->checkCollisions(this->gameWorldData->objectManager->getObjectList(OM_GROUP_00),
-      this->gameWorldData->objectManager->getObjectList(OM_GROUP_01_PROJ));
-  CDEngine::getInstance()->checkCollisions(this->gameWorldData->objectManager->getObjectList(OM_GROUP_01),
-      this->gameWorldData->objectManager->getObjectList(OM_COMMON));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+      this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+      this->dataTank->objectManager->getObjectList(OM_COMMON));
 }
 
@@ -384 +386 @@
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
   // set camera
-  this->gameWorldData->localCamera->apply ();
+  this->dataTank->localCamera->apply ();
   // draw world
   this->draw();
@@ -456 +458 @@
 {
   PRINTF(3)("GameWorld::displayLoadScreen - start\n");
-  this->gameWorldData->glmis = new GLMenuImageScreen();
-  this->gameWorldData->glmis->setMaximum(8);
+  this->dataTank->glmis = new GLMenuImageScreen();
+  this->dataTank->glmis->setMaximum(8);
   PRINTF(3)("GameWorld::displayLoadScreen - end\n");
 }
@@ -468 +470 @@
 {
   PRINTF(3)("GameWorld::releaseLoadScreen - start\n");
-  this->gameWorldData->glmis->setValue(this->gameWorldData->glmis->getMaximum());
+  this->dataTank->glmis->setValue(this->dataTank->glmis->getMaximum());
   PRINTF(3)("GameWorld::releaseLoadScreen - end\n");
 }