Changeset 3238 for code/branches/core4/src/orxonox

Timestamp:

Jun 28, 2009, 1:47:57 PM (15 years ago)

Author:

rgrieder

Message:

Improved exception-safety in the Game class and fixed some issues and bugs resulting from the changes.

Location:

code/branches/core4/src/orxonox

Files:

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

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

@@ -68 +68 @@
         );
 
+        orxonox.requestState("root");
         orxonox.run();
 

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

@@ -57 +57 @@
 namespace orxonox
 {
-    AddGameState(GSGraphics, "graphics", false);
+    AddGameState(GSGraphics, "graphics", true);
 
     GSGraphics::GSGraphics(const std::string& name, bool countTickTime)
@@ -198 +198 @@
     void GSGraphics::toggleGUI()
     {
-            GUIManager::getInstance().executeCode("toggleGUI()");
+        GUIManager::getInstance().executeCode("toggleGUI()");
     }
 

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

@@ -40 +40 @@
 namespace orxonox
 {
-    AddGameState(GSRoot, "root", false);
+    AddGameState(GSRoot, "root", true);
     SetCommandLineSwitch(console);
     // Shortcuts for easy direct loading