Changeset 6874 in orxonox.OLD for trunk/src/story_entities/campaign.cc

Timestamp:

Jan 30, 2006, 11:03:30 PM (18 years ago)

Author:

patrick

Message:

trunk: the menu control better implemented

File:

• trunk/src/story_entities/campaign.cc (modified) (4 diffs)

trunk/src/story_entities/campaign.cc

@@ -40 +40 @@
   assert( root != NULL);
 
+  this->bReturnToMenu = false;
+
   this->campaignData = new CampaignData(root);
   this->loadParams(root);
@@ -77 +79 @@
 
   this->isRunning = true;
+  this->bReturnToMenu = false;
   this->run();
 }
@@ -106 +109 @@
 {
   PRINTF(4)("Stopping the current Campaign\n");
-  //this->isRunning = false;
+  this->bReturnToMenu = true;
   if( this->currentEntity != NULL)
   {
-    this->currentEntity->setNextStoryID(0);
     this->currentEntity->stop();
   }
@@ -129 +131 @@
     PRINTF(0)("Campaign is starting StoryEntity nr:%i\n", this->currentEntity->getStoryID());
 
+    // check if return to menu
+    if( this->bReturnToMenu)
+    {
+      this->currentEntity = this->campaignData->getLevel(WORLD_ID_MENU);
+      this->bReturnToMenu = false;
+    }
+
+    this->campaignData->setCurrentEntity(this->currentEntity);
+
     this->currentEntity->init();
-
     this->currentEntity->loadData();
     this->currentEntity->start();
     this->currentEntity->unloadData();
   }
-  PRINTF(2)("There is no StoryEnity left to play, returning to Main Menu\n");
+  PRINTF(2)("There is no StoryEnity left to play, quitting game\n");
 }