Changeset 2845 for code/branches/gui/src/orxonox

Timestamp:

Mar 25, 2009, 5:33:58 PM (16 years ago)

Author:

rgrieder

Message:

• Moved some code from Game to Main and GSRoot
• Renamed "gui" GameState to "mainMenu"

Location:

code/branches/gui/src/orxonox

Files:

• Main.cc (modified) (1 diff)
• gamestates/GSGUI.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (3 diffs)

code/branches/gui/src/orxonox/Main.cc

@@ -48 +48 @@
     {
         orxonox::Game orxonox(argc, argv);
+
+        orxonox.setStateHierarchy(
+        "root"
+        " graphics"
+        "  mainMenu"
+        "  standalone"
+        "   level"
+        "  server"
+        "   level"
+        "  client"
+        "   level"
+        " dedicated"
+        "  level"
+        " ioConsole"
+        );
+
         orxonox.run();
     } // orxonox gets destroyed right here!

code/branches/gui/src/orxonox/gamestates/GSGUI.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    AddGameState(GSGUI, "gui");
+    AddGameState(GSGUI, "mainMenu");
 
     GSGUI::GSGUI(const std::string& name)

code/branches/gui/src/orxonox/gamestates/GSRoot.cc

@@ -34 +34 @@
 #include "core/Clock.h"
 #include "core/Core.h"
+#include "core/CommandLine.h"
 #include "core/ConsoleCommand.h"
 #include "tools/TimeFactorListener.h"
@@ -43 +44 @@
 {
     AddGameState(GSRoot, "root");
+    SetCommandLineSwitch(startWithConsole);
 
     GSRoot::GSRoot(const std::string& name)
@@ -78 +80 @@
             CommandExecutor::addConsoleCommandShortcut(this->ccPause_).accessLevel(AccessLevel::Offline);
         }
+
+        // Determine where to start
+        if (CommandLine::getValue("startWithConsole").getBool())
+        {
+            // Start the game in the console
+            Game::getInstance().requestState("ioConsole");
+        }
+        else
+        {
+            // Start in GUI main menu
+            Game::getInstance().requestState("graphics");
+            Game::getInstance().requestState("mainMenu");
+        }
+
     }