Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1054 for code/trunk/src


Ignore:
Timestamp:
Apr 14, 2008, 4:10:44 AM (17 years ago)
Author:
landauf
Message:

included ConfigFileManager

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/Orxonox.cc

    r1052 r1054  
    5555
    5656// core
     57#include "core/ConfigFileManager.h"
    5758#include "core/ConsoleCommand.h"
    5859#include "core/Debug.h"
     
    138139    this->frameSmoothingTime_ = 0.0f;
    139140    this->bAbort_ = false;
     141    this->timefactor_ = 1.0f;
    140142  }
    141143
     
    288290  void Orxonox::clientStart(){
    289291    ogre_->initialise();
     292    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
    290293    Factory::createClassHierarchy();
    291294
     
    315318    ogre_->initialise();
    316319    //TODO: run engine
     320    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
    317321    Factory::createClassHierarchy();
    318322    createScene();
     
    328332    ogre_->initialise();
    329333    //TODO: run engine
     334    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
    330335    Factory::createClassHierarchy();
    331336    createScene();
Note: See TracChangeset for help on using the changeset viewer.