Changeset 6862 in orxonox.OLD

Timestamp:

Jan 30, 2006, 11:22:25 AM (18 years ago)

Author:

patrick

Message:

trunk: the game now always jumps back to the menu

Location:

trunk/src

Files:

• story_entities/campaign.cc (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (3 diffs)
• story_entities/simple_game_menu.h (modified) (1 diff)
• util/loading/game_loader.cc (modified) (2 diffs)
• util/loading/game_loader.h (modified) (1 diff)

trunk/src/story_entities/campaign.cc

@@ -106 +106 @@
 {
   PRINTF(4)("Stopping the current Campaign\n");
-  this->isRunning = false;
+  //this->isRunning = false;
   if( this->currentEntity != NULL)
   {
+    this->currentEntity->setNextStoryID(0);
     this->currentEntity->stop();
   }
@@ -134 +135 @@
     this->currentEntity->unloadData();
   }
-  PRINTF(2)("There is no StoryEnity left to play, quitting\n");
+  PRINTF(2)("There is no StoryEnity left to play, returning to Main Menu\n");
 }
 

trunk/src/story_entities/simple_game_menu.cc

@@ -59 +59 @@
   this->menuLayer.push_back(new MenuLayer());
   this->menuLayer.push_back(new MenuLayer());
+
   this->layerIndex = 0;
+  this->menuSelectedIndex = 0;
 
   this->loadParams(root);
@@ -114 +116 @@
 
   GraphicsEngine::getInstance()->displayFPS(false);
+
+  this->layerIndex = 0;
+  this->menuSelectedIndex = 0;
 }
 
@@ -205 +210 @@
 
 
+ErrorMessage SimpleGameMenu::unloadData()
+{
+  GameWorld::unloadData();
+
+  EventHandler::getInstance()->unsubscribe(this, ES_MENU);
+
+  std::vector<ImageEntity*>::iterator it;
+  std::vector<MenuLayer*>::iterator mit;
+  for(mit = this->menuLayer.begin(); mit != this->menuLayer.end(); mit++)
+  {
+    (*mit)->menuList.erase((*mit)->menuList.begin(), (*mit)->menuList.end());
+    (*mit)->storyList.erase((*mit)->storyList.begin(), (*mit)->storyList.end());
+  }
+}
+
 
 /**

trunk/src/story_entities/simple_game_menu.h

@@ -50 +50 @@
     virtual ErrorMessage init();
     virtual ErrorMessage loadData();
+    virtual ErrorMessage unloadData();
 
     virtual bool start();

trunk/src/util/loading/game_loader.cc

@@ -47 +47 @@
   this->setClassID(CL_GAME_LOADER, "GameLoader");
   this->setName("GameLoader");
-
+  this->bRun = true;
 }
 
@@ -162 +162 @@
 {
   if(this->currentCampaign != NULL)
+  {
     this->currentCampaign->start();
+  }
 }
 

trunk/src/util/loading/game_loader.h

@@ -70 +70 @@
   Uint32                 startTime;            //!< start time of the campaign
   bool                   isPaused;             //!< if the game is paused
+  bool                   bRun;                 //!< true if stop
 
   Campaign*              currentCampaign;      //!< reference to the current campaign playing