Changeset 6105 for code/trunk/src/orxonox/Main.cc

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/Main.cc (modified) (2 diffs)

code/trunk/src/orxonox/Main.cc

@@ -68 +68 @@
         "  standalone,server,client"
         "   level"
-        " dedicated,dedicatedClient"
+        " server,client"
         "  level"
-        " ioConsole"
         );
 
@@ -83 +82 @@
             Game::getInstance().requestStates("graphics, client, level");
         else if (CommandLineParser::getValue("dedicated").getBool())
-            Game::getInstance().requestStates("dedicated, level");
+            Game::getInstance().requestStates("server, level");
         else if (CommandLineParser::getValue("dedicatedClient").getBool())
-            Game::getInstance().requestStates("dedicatedClient, level");
-        else if (CommandLineParser::getValue("console").getBool())
-            Game::getInstance().requestStates("ioConsole");
+            Game::getInstance().requestStates("client, level");
         else
-            Game::getInstance().requestStates("graphics, mainMenu");
+        {
+            if (!CommandLineParser::getValue("console").getBool())
+                Game::getInstance().requestStates("graphics, mainMenu");
+        }
 
         game->run();