Changeset 6105 for code/trunk/src/orxonox/gamestates

Timestamp:

Nov 20, 2009, 4:55:40 PM (14 years ago)

Author:

rgrieder

Message:

Merged console branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gamestates/GSClient.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSDedicated.h (deleted)
• src/orxonox/gamestates/GSDedicatedClient.h (deleted)
• src/orxonox/gamestates/GSIOConsole.cc (deleted)
• src/orxonox/gamestates/GSIOConsole.h (deleted)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• src/orxonox/gamestates/GSServer.cc (modified) (1 diff)

code/trunk/src/orxonox/gamestates/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   GSClient.cc
-  GSDedicated.cc
-  GSDedicatedClient.cc
   GSGraphics.cc
-  GSIOConsole.cc
   GSLevel.cc
   GSMainMenu.cc

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

@@ -29 +29 @@
 #include "GSClient.h"
 
-#include "util/Clock.h"
+#include "util/Debug.h"
 #include "util/Exception.h"
 #include "core/CommandLineParser.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    DeclareGameState(GSClient, "client", false, true);
+    DeclareGameState(GSClient, "client", false, false);
 
     SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as string in the form #.#.#.#");

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

@@ -91 +91 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startDedicated), "startDedicated"));
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu), "startMainMenu"));
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startIOConsole), "startIOConsole"));
 
         KeyBinderManager::getInstance().setToDefault();
@@ -146 +145 @@
         Game::getInstance().popState();
         Game::getInstance().popState();
-        Game::getInstance().requestStates("dedicated, level");
+        Game::getInstance().requestStates("server, level");
     }
     void GSMainMenu::startMainMenu()
@@ -155 +154 @@
         Game::getInstance().requestStates("mainmenu");
     }
-    void GSMainMenu::startIOConsole()
-    {
-        // HACK - HACK
-        Game::getInstance().popState();
-        Game::getInstance().popState();
-        Game::getInstance().requestStates("ioConsole");
-    }
 }

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

@@ -90 +90 @@
     void GSRoot::update(const Clock& time)
     {
-        if (this->getActivity().topState)
-        {
-            // This state can not 'survive' on its own.
-            // Load a user interface therefore
-            Game::getInstance().requestState("ioConsole");
-        }
-
         for (ObjectList<Timer>::iterator it = ObjectList<Timer>::begin(); it; )
             (it++)->tick(time);

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

@@ -37 +37 @@
 namespace orxonox
 {
-    DeclareGameState(GSServer, "server", false, true);
+    DeclareGameState(GSServer, "server", false, false);
 
     SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");