Changeset 9667 for code/trunk/src/libraries/core/Game.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/Game.cc (modified) (2 diffs)

code/trunk/src/libraries/core/Game.cc

@@ -44 +44 @@
 #include "util/Sleep.h"
 #include "util/SubString.h"
-#include "CommandLineParser.h"
 #include "Core.h"
 #include "CoreIncludes.h"
-#include "ConfigValueIncludes.h"
+#include "config/CommandLineParser.h"
+#include "config/ConfigValueIncludes.h"
 #include "GameMode.h"
 #include "GameState.h"
@@ -112 +112 @@
 
         // Do this after the Core creation!
-        RegisterRootObject(Game);
+        RegisterObject(Game);
         this->setConfigValues();