Changeset 3094 for code/trunk/src

Timestamp:

May 27, 2009, 9:42:13 PM (16 years ago)

Author:

rgrieder

Message:

Adding functionality to the server, client and dedicated buttons (rather hacky though..)

Location:

code/trunk/src/orxonox/gamestates

Files:

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

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -73 +73 @@
 
         {
-            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startGame);
+            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startStandalone);
             functor->setObject(this);
-            this->ccStartGame_ = createConsoleCommand(functor, "startGame");
-            CommandExecutor::addConsoleCommandShortcut(this->ccStartGame_);
+            this->ccStartStandalone_ = createConsoleCommand(functor, "startGame");
+            CommandExecutor::addConsoleCommandShortcut(this->ccStartStandalone_);
+        }
+        {
+            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startServer);
+            functor->setObject(this);
+            this->ccStartServer_ = createConsoleCommand(functor, "startServer");
+            CommandExecutor::addConsoleCommandShortcut(this->ccStartServer_);
+        }
+        {
+            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startClient);
+            functor->setObject(this);
+            this->ccStartClient_ = createConsoleCommand(functor, "startClient");
+            CommandExecutor::addConsoleCommandShortcut(this->ccStartClient_);
+        }
+        {
+            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startDedicated);
+            functor->setObject(this);
+            this->ccStartDedicated_ = createConsoleCommand(functor, "startDedicated");
+            CommandExecutor::addConsoleCommandShortcut(this->ccStartDedicated_);
         }
 
@@ -110 +128 @@
     }
 
-    void GSMainMenu::startGame()
+    void GSMainMenu::startStandalone()
     {
         // HACK - HACK
@@ -116 +134 @@
         Game::getInstance().requestStates("standalone, level");
     }
+
+    void GSMainMenu::startServer()
+    {
+        // HACK - HACK
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("server, level");
+    }
+
+    void GSMainMenu::startClient()
+    {
+        // HACK - HACK
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("client, level");
+    }
+
+    void GSMainMenu::startDedicated()
+    {
+        // HACK - HACK
+        Game::getInstance().popState();
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("dedicated, level");
+    }
 }

code/trunk/src/orxonox/gamestates/GSMainMenu.h

@@ -46 +46 @@
         void update(const Clock& time);
 
-        void startGame();
+        void startStandalone();
+        void startServer();
+        void startClient();
+        void startDedicated();
 
     private:
@@ -54 +57 @@
 
         // console commands
-        ConsoleCommand* ccStartGame_;
+        ConsoleCommand* ccStartStandalone_;
+        ConsoleCommand* ccStartServer_;
+        ConsoleCommand* ccStartClient_;
+        ConsoleCommand* ccStartDedicated_;
 
         // ambient sound for the main menu