Changeset 5817 for code/branches/core5/src

Timestamp:

Sep 27, 2009, 10:17:54 PM (15 years ago)

Author:

scheusso

Message:

console commands for switching back to MainMenu from Game mode

Location:

code/branches/core5/src/modules/gamestates

Files:

• GSMainMenu.cc (modified) (2 diffs)
• GSMainMenu.h (modified) (2 diffs)

code/branches/core5/src/modules/gamestates/GSMainMenu.cc

@@ -99 +99 @@
             CommandExecutor::addConsoleCommandShortcut(this->ccStartDedicated_);
         }
+        {
+            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startMainMenu);
+            functor->setObject(this);
+            this->ccStartMainMenu_ = createConsoleCommand(functor, "startMainMenu");
+            CommandExecutor::addConsoleCommandShortcut(this->ccStartMainMenu_);
+        }
 
         InputManager::getInstance().enterState("mainMenu");
@@ -156 +162 @@
         Game::getInstance().requestStates("dedicated, level");
     }
+    void GSMainMenu::startMainMenu()
+    {
+        // HACK - HACK
+        Game::getInstance().popState();
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("mainmenu");
+    }
 }

code/branches/core5/src/modules/gamestates/GSMainMenu.h

@@ -51 +51 @@
         void startClient();
         void startDedicated();
+        void startMainMenu();
 
     private:
@@ -62 +63 @@
         ConsoleCommand* ccStartClient_;
         ConsoleCommand* ccStartDedicated_;
+        ConsoleCommand* ccStartMainMenu_;
 
         // ambient sound for the main menu