Changeset 10479 for code/branches/core7/src/orxonox

Timestamp:

May 25, 2015, 7:20:21 PM (9 years ago)

Author:

landauf

Message:

moved config values and all related functions from Game and Core to GameConfig and CoreConfig respectively. this ensures that no framework features are used by Game and Core before Core itself initialized the framework.

Location:

code/branches/core7/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (1 diff)

code/branches/core7/src/orxonox/gamestates/GSLevel.cc

@@ -170 +170 @@
         bool loaded = Loader::getInstance().open(startFile_);
 
-        Core::getInstance().updateLastLevelTimestamp();
+        Core::getInstance().getConfig()->updateLastLevelTimestamp();
         if(!loaded)
             GSRoot::delayedStartMainMenu();

code/branches/core7/src/orxonox/gametypes/Gametype.cc

@@ -409 +409 @@
                     {
                         // If in developer's mode, there is no start countdown.
-                        if(Core::getInstance().inDevMode())
+                        if(Core::getInstance().getConfig()->inDevMode())
                             this->start();
                         else