Changeset 6370 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

network: working on campaing and gameworld structure

Location:

branches/network/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• game_world.cc (modified) (5 diffs)
• game_world.h (modified) (1 diff)

branches/network/src/story_entities/campaign.cc

@@ -122 +122 @@
     {
       PRINTF(0)("Starting new StoryEntity Nr:%i\n", se->getStoryID());
-      se->preLoad();
+
+      se->init();
+
+      //se->preLoad();
       se->load();
-      se->postLoad();
-
-      se->init();
+      //se->postLoad();
+
+
       se->preStart();
       se->start();

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();
 }

branches/network/src/story_entities/game_world.h

@@ -35 +35 @@
     void loadParams(const TiXmlElement* root);
 
-    /* classes from story-entity */
-    virtual ErrorMessage preLoad();
-    virtual ErrorMessage load ();
-    virtual ErrorMessage postLoad();
+    /* functions from story-entity */
+    virtual ErrorMessage init();
+    virtual ErrorMessage load();
 
     virtual ErrorMessage preStart();
-    virtual ErrorMessage start ();
-    virtual ErrorMessage stop ();
-    virtual ErrorMessage pause ();
-    virtual ErrorMessage resume ();
-    virtual ErrorMessage destroy ();
+    virtual ErrorMessage start();
+    virtual ErrorMessage stop();
+    virtual ErrorMessage pause();
+    virtual ErrorMessage resume();
+    virtual ErrorMessage destroy();
 
     virtual void displayLoadScreen();