Changeset 2854

Timestamp:

Mar 26, 2009, 4:33:32 PM (16 years ago)

Author:

rgrieder

Message:

small fixes with game states.

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (1 diff)
• GSRoot.cc (modified) (2 diffs)

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

@@ -143 +143 @@
     void GSGraphics::update(const Clock& time)
     {
+        if (this->getActivity().topState)
+        {
+            // This state can not 'survive' on its own.
+            // Load a user interface therefore
+            Game::getInstance().requestState("mainMenu");
+        }
+
         uint64_t timeBeforeTick = time.getRealMicroseconds();
 

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

@@ -100 +100 @@
         if (CommandLine::getValue("client").getBool())
         {
-            Game::getInstance().requestStates("graphics, standalone, level");
+            Game::getInstance().requestStates("graphics, client, level");
             loadLevel = true;
         }
@@ -109 +109 @@
         }
         
-        // Determine where to start
-        if (!loadLevel)
-        {
-            if (CommandLine::getValue("console").getBool())
-            {
-                // Start the game in the console without 3D graphics
-                Game::getInstance().requestState("ioConsole");
-            }
-            else
-            {
-                // Start in GUI mode
-                Game::getInstance().requestStates("graphics, mainMenu");
-            }
+        // Determine where to start otherwise
+        if (!loadLevel && !CommandLine::getValue("console").getBool())
+        {
+            // Also load graphics
+            Game::getInstance().requestState("graphics");
         }
     }