Changeset 3243 for code/branches/core4/src/orxonox/gamestates/GSRoot.cc

Timestamp:

Jun 28, 2009, 6:22:40 PM (15 years ago)

Author:

rgrieder

Message:

Moved GameState construction from pre-main() to after Core creation. That makes it possible to use Core features (like configValues) in the GameState constructor.

File:

• code/branches/core4/src/orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

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

@@ -40 +40 @@
 namespace orxonox
 {
-    AddGameState(GSRoot, "root", true);
+    DeclareGameState(GSRoot, "root", true, false);
     SetCommandLineSwitch(console);
     // Shortcuts for easy direct loading
@@ -48 +48 @@
     SetCommandLineSwitch(standalone);
 
-    GSRoot::GSRoot(const std::string& name, bool countTickTime)
-        : GameState(name, countTickTime)
+    GSRoot::GSRoot(const GameStateConstrParams& params)
+        : GameState(params)
         , timeFactor_(1.0f)
         , bPaused_(false)