Changeset 1054 for code/trunk

Timestamp:

Apr 14, 2008, 4:10:44 AM (17 years ago)

Author:

landauf

Message:

included ConfigFileManager

File:

• code/trunk/src/orxonox/Orxonox.cc (modified) (5 diffs)

code/trunk/src/orxonox/Orxonox.cc

@@ -55 +55 @@
 
 // core
+#include "core/ConfigFileManager.h"
 #include "core/ConsoleCommand.h"
 #include "core/Debug.h"
@@ -138 +139 @@
     this->frameSmoothingTime_ = 0.0f;
     this->bAbort_ = false;
+    this->timefactor_ = 1.0f;
   }
 
@@ -288 +290 @@
   void Orxonox::clientStart(){
     ogre_->initialise();
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
     Factory::createClassHierarchy();
 
@@ -315 +318 @@
     ogre_->initialise();
     //TODO: run engine
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
     Factory::createClassHierarchy();
     createScene();
@@ -328 +332 @@
     ogre_->initialise();
     //TODO: run engine
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
     Factory::createClassHierarchy();
     createScene();