Changeset 7032 in orxonox.OLD for trunk

Timestamp:

Feb 4, 2006, 5:01:11 AM (18 years ago)

Author:

bensch

Message:

testing

Location:

trunk/src

Files:

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

trunk/src/story_entities/campaign.cc

@@ -110 +110 @@
 {
   PRINTF(4)("Stopping the current Campaign\n");
-  if( State::getMenuMode())
+  if( State::getMenuID() != -1)
     this->bReturnToMenu = true;
   else

trunk/src/story_entities/simple_game_menu.cc

@@ -65 +65 @@
   this->loadParams(root);
 
-  State::setMenuMode(true);
+  State::setMenuID(this->getNextStoryID());
 }
 

trunk/src/util/state.cc

@@ -49 +49 @@
 bool State::bOnline = false;
 
-bool State::bMenuMode = false;
+int State::menuID = -1;
 
 

trunk/src/util/state.h

@@ -90 +90 @@
   ////////////
   /** sets the menu mode @param mode true if always exit to menu */
-  static inline void setMenuMode(bool mode) { State::bMenuMode = mode; }
+  static inline void setMenuID(int menuID) { State::menuID = menuID; }
   /** @returns the menu mode */
-  static inline bool getMenuMode() { return State::bMenuMode;}
+  static inline int getMenuID() { return State::menuID;}
 
 
@@ -111 +111 @@
   static unsigned int           resX;              //!< The X Resolution of the screen.
   static unsigned int           resY;              //!< The Y Resolution of the screen.
-
+  static int                    menuID;            //!< -1 on default, otherwise orxonox's Menu ID
   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)
-
   };