Changeset 6622 for code/branches
- Timestamp:
- Mar 27, 2010, 5:39:26 PM (14 years ago)
- Location:
- code/branches/gamestate/src/libraries/core
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gamestate/src/libraries/core/Core.cc
r6537 r6622 78 78 79 79 SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file"); 80 SetCommandLineSwitch(noIOConsole).information("Use this if you don't want to use the IOConsole (for instance for Lua debugging)"); 80 81 #ifdef ORXONOX_PLATFORM_WINDOWS 81 82 SetCommandLineArgument(limitToCPU, 1).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is the first core (faster than off)"); … … 88 89 , consoleCommandDestroyer_(CommandExecutor::destroyExternalCommands) 89 90 , bGraphicsLoaded_(false) 91 , bStartIOConsole_(true) 90 92 { 91 93 // Set the hard coded fixed paths … … 149 151 150 152 // create persistent io console 151 this->ioConsole_.reset(new IOConsole()); 153 if (CommandLineParser::getValue("noIOConsole").getBool()) 154 { 155 ModifyConfigValue(bStartIOConsole_, tset, false); 156 } 157 if (this->bStartIOConsole_) 158 this->ioConsole_.reset(new IOConsole()); 152 159 153 160 // creates the class hierarchy for all classes with factories … … 193 200 .description("If true, all random actions are different each time you start the game") 194 201 .callback(this, &Core::initRandomNumberGenerator); 202 SetConfigValue(bStartIOConsole_, true) 203 .description("Set to false if you don't want to use the IOConsole (for Lua debugging for instance)"); 195 204 } 196 205 … … 327 336 } 328 337 // Process console events and status line 329 this->ioConsole_->preUpdate(time); 338 if (this->ioConsole_ != NULL) 339 this->ioConsole_->preUpdate(time); 330 340 // Process thread commands 331 341 this->tclThreadManager_->preUpdate(time); -
code/branches/gamestate/src/libraries/core/Core.h
r6442 r6622 97 97 scoped_ptr<TclBind> tclBind_; 98 98 scoped_ptr<TclThreadManager> tclThreadManager_; 99 scoped_ptr<Scope<ScopeID::Root> > 99 scoped_ptr<Scope<ScopeID::Root> > rootScope_; 100 100 // graphical 101 101 scoped_ptr<GraphicsManager> graphicsManager_; //!< Interface to OGRE … … 108 108 std::string language_; //!< The language 109 109 bool bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called 110 bool bStartIOConsole_; //!< Set to false if you don't want to use the IOConsole 110 111 111 112 static Core* singletonPtr_s;
Note: See TracChangeset
for help on using the changeset viewer.