Changeset 1020 for code/branches/core2/src/orxonox/Orxonox.cc

Timestamp:

Apr 10, 2008, 4:39:06 PM (16 years ago)

Author:

landauf

Message:

changed ConfigValueContainer to use ConfigFileManager, but there is still an error

File:

• code/branches/core2/src/orxonox/Orxonox.cc (modified) (4 diffs)

code/branches/core2/src/orxonox/Orxonox.cc

@@ -89 +89 @@
 #include "core/CommandExecutor.h"
 #include "core/InputBuffer.h"
+#include "core/ConfigFileManager.h"
 
 #include "Orxonox.h"
@@ -250 +251 @@
     ogre_->startRender();
     //TODO: run engine
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
     Factory::createClassHierarchy();
     createScene();
@@ -1231 +1233 @@
     setupInputSystem();
     createFrameListener();
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
     Factory::createClassHierarchy();
     startRenderLoop();*/
@@ -1245 +1248 @@
     initializeResourceGroups();
     setupInputSystem();
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
     Factory::createClassHierarchy();
     createScene();