Changeset 6874 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

trunk: the menu control better implemented

Location:

trunk/src

Files:

• story_entities/campaign.cc (modified) (4 diffs)
• story_entities/campaign.h (modified) (1 diff)
• story_entities/campaign_data.cc (modified) (1 diff)
• story_entities/campaign_data.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)
• story_entities/simple_game_menu.h (modified) (1 diff)
• story_entities/story_def.h (modified) (2 diffs)
• util/state.cc (modified) (1 diff)
• util/state.h (modified) (2 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");
 }
 

trunk/src/story_entities/campaign.h

@@ -37 +37 @@
     StoryEntity*                        currentEntity;          //!< reference to the current StoryEntity
     CampaignData*                       campaignData;           //!< reference to the CampaignData
+
+    bool                                bReturnToMenu;          //!< is true, if the StoryEntity should return to the Mainmenu after termination
 };
 

trunk/src/story_entities/campaign_data.cc

@@ -139 +139 @@
 
 
+/**
+ * @param storyID the story ID to look for
+ * @returns a pointer to a StoryEntity with the storyID
+ */
+StoryEntity* CampaignData::getLevel(int storyID)
+{
+  list<StoryEntity*>::iterator   it;
+  for( it = this->storyEntities.begin(); it != this->storyEntities.end(); it++)
+  {
+    if( storyID == (*it)->getStoryID())
+      return (*it);
+  }
+  return NULL;
+}
 
-

trunk/src/story_entities/campaign_data.h

@@ -29 +29 @@
     StoryEntity* getFirstLevel();
     StoryEntity* getNextLevel();
+    StoryEntity* getLevel(int storyID);
+
+    /** @param storyEntity the current entity to be set */
+    inline void setCurrentEntity(StoryEntity* storyEntity) { this->currentEntity = storyEntity; }
+    /** @return the current StoryEntity played*/
+    inline StoryEntity* getCurrentEntity() { return this->currentEntity; }
 
 

trunk/src/story_entities/simple_game_menu.cc

@@ -198 +198 @@
     {
       this->menuLayer[1]->storyList.push_back(se);
-      PRINTF(0)("Got a new menu entry |%s|\n", se->getName());
+
+      // generating menu item
       ImageEntity* ie = new ImageEntity();
-      PRINTF(0)("setting texture to: |%s|\n", se->getMenuItemImage());
       ie->setTexture(se->getMenuItemImage());
       ie->setRelCoor(0.0f,20.0f - (this->menuLayer[1]->menuList.size() * 10.0f), 0.0f);
       ie->setVisibility(false);
       this->menuLayer[1]->menuList.push_back(ie);
+
+      // generating screenshoot item
+//       ie = new ImageEntity();
+//       ie->setTexture(se->getMenuScreenshoot);
+//       ie->setRelCoor(.0f, 10.0f, 0.0f);
+//       this->menuLayer[1]->screenshootList.push_back(ie);
+
     }
   }

trunk/src/story_entities/simple_game_menu.h

@@ -31 +31 @@
     std::vector<ImageEntity*>         menuList;                        //!< the list of the menu items
     std::vector<StoryEntity*>         storyList;                       //!< the list of the StoryEntities for the menu
+    std::vector<ImageEntity*>         screenshootList;                 //!< list of the screen shoots FIXME: make a better structure for this stuff
 };
 

trunk/src/story_entities/story_def.h

@@ -12 +12 @@
 #define DEBUG_WORLD_2 102
 
+
 #define WORLD_ID_0 0
 #define WORLD_ID_1 1
@@ -18 +19 @@
 #define WORLD_ID_4 4
 #define WORLD_ID_5 5
+
+#define WORLD_ID_MENU    0
 #define WORLD_ID_GAMEEND 999
 

trunk/src/util/state.cc

@@ -43 +43 @@
 bool State::bOnline = false;
 
+bool State::bMenuMode = false;
+
+
 /**
  *  sets camera and target of the current Camera

trunk/src/util/state.h

@@ -82 +82 @@
 
 
+  ////////////
+  /// Menu ///
+  ////////////
+  /** sets the menu mode @param mode true if always exit to menu */
+  static inline void setMenuMode(bool mode) { State::bMenuMode = mode; }
+  /** @returns the menu mode */
+  static inline bool getMenuMode() { return State::bMenuMode;}
+
+
+
  private:
   State();
@@ -97 +107 @@
 
   static bool                   bOnline;           //!< Is true if this node is in multiplayer mode (via network)
+  static bool                   bMenuMode;         //!< True is orxonox is player in the menu mode (always returning to the menu after exit)
 
   };