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

Timestamp:

Dec 31, 2005, 1:52:50 PM (20 years ago)

Author:

patrick

Message:

network: working on campaing and gameworld structure

File:

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

branches/network/src/story_entities/game_world.cc

@@ -87 +87 @@
 
   this->gameTime = 0.0f;
-  this->setSpeed(1.0);
+  this->setSpeed(1.0f);
   this->music = NULL;
   this->shell = NULL;
@@ -169 +169 @@
  * before the load and after the proceeding storyentity has finished
 */
-ErrorMessage GameWorld::preLoad()
+ErrorMessage GameWorld::init()
 {
   State::setObjectManager(&this->objectManager);
@@ -190 +190 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
-  this->displayLoadScreen();
 }
 
@@ -199 +198 @@
 ErrorMessage GameWorld::load()
 {
+  this->displayLoadScreen();
+
   PRINTF(3)("> Loading world: '%s'\n", getPath());
   TiXmlElement* element;
@@ -348 +349 @@
   //(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
   //music->playback();
-}
-
-ErrorMessage GameWorld::postLoad()
-{
+
   this->releaseLoadScreen();
 }