Changeset 1268 for code/branches/merge/src/orxonox/Orxonox.cc
- Timestamp:
- May 13, 2008, 10:13:17 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/merge/src/orxonox/Orxonox.cc
r1266 r1268 201 201 void Orxonox::abortRequest() 202 202 { 203 COUT(3) << " ***Orxonox: Abort requested." << std::endl;203 COUT(3) << "Orxonox: Abort requested." << std::endl; 204 204 bAbort_ = true; 205 205 } … … 246 246 return false; 247 247 248 COUT(3) << "*** Orxonox: Mode is " << mode << "." << std::endl;249 248 if (mode == "client") 250 249 mode_ = CLIENT; … … 252 251 mode_ = SERVER; 253 252 else 253 { 254 mode = "standalone"; 254 255 mode_ = STANDALONE; 256 } 257 COUT(3) << "Orxonox: Mode is " << mode << "." << std::endl; 255 258 256 259 //if (mode_ == DEDICATED) … … 343 346 344 347 // Load the HUD 345 COUT(3) << " ***Orxonox: Loading HUD..." << std::endl;348 COUT(3) << "Orxonox: Loading HUD..." << std::endl; 346 349 Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2"); 347 350 orxonoxHUD_ = new HUD(); … … 350 353 hudOverlay->show(); 351 354 352 COUT(3) << " ***Orxonox: Loading Console..." << std::endl;355 COUT(3) << "Orxonox: Loading Console..." << std::endl; 353 356 InputBuffer* ib = dynamic_cast<InputBuffer*>(InputManager::getKeyHandler("buffer")); 354 357 /* … … 445 448 if (Ogre::Root::getSingletonPtr() == 0) 446 449 { 447 COUT(2) << " ***Orxonox Error: Could not start rendering. No Ogre root object found" << std::endl;450 COUT(2) << "Orxonox Error: Could not start rendering. No Ogre root object found" << std::endl; 448 451 return false; 449 452 } … … 466 469 timer_->reset(); 467 470 468 COUT(3) << " ***Orxonox: Starting the main loop." << std::endl;471 COUT(3) << "Orxonox: Starting the main loop." << std::endl; 469 472 while (!bAbort_) 470 473 {
Note: See TracChangeset
for help on using the changeset viewer.