Changeset 2710 for code/trunk/src/orxonox/gamestates/GSRoot.cc
- Timestamp:
- Feb 28, 2009, 7:46:37 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore deleted
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSRoot.cc
r2662 r2710 44 44 #include "tools/Timer.h" 45 45 #include "objects/Tickable.h" 46 #include "Settings.h" 47 48 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 46 47 #ifdef ORXONOX_PLATFORM_WINDOWS 49 48 # ifndef WIN32_LEAN_AND_MEAN 50 49 # define WIN32_LEAN_AND_MEAN … … 63 62 namespace orxonox 64 63 { 65 SetCommandLineArgument(dataPath, "").information("PATH");66 64 SetCommandLineArgument(limitToCPU, 1).information("0: off | #cpu"); 67 65 … … 71 69 , bPaused_(false) 72 70 , timeFactorPauseBackup_(1.0f) 73 , settings_(0)74 71 , tclBind_(0) 75 72 , tclThreadManager_(0) … … 113 110 this->luaBind_ = new LuaBind(); 114 111 115 // instantiate Settings class116 this->settings_ = new Settings();117 118 std::string dataPath = CommandLine::getValue("dataPath");119 if (dataPath != "")120 {121 if (*dataPath.end() != '/' && *dataPath.end() != '\\')122 Settings::tsetDataPath(dataPath + "/");123 else124 Settings::tsetDataPath(dataPath);125 }126 127 112 // initialise TCL 128 this->tclBind_ = new TclBind( Settings::getDataPath());113 this->tclBind_ = new TclBind(Core::getMediaPathPOSIXString()); 129 114 this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter()); 130 115 … … 182 167 delete this->tclBind_; 183 168 184 delete this->settings_;185 169 delete this->luaBind_; 186 170 … … 269 253 void GSRoot::setThreadAffinity(unsigned int limitToCPU) 270 254 { 271 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32255 #ifdef ORXONOX_PLATFORM_WINDOWS 272 256 // Get the current process core mask 273 257 DWORD procMask;
Note: See TracChangeset
for help on using the changeset viewer.