Changeset 6256
- Timestamp:
- Dec 6, 2009, 5:07:22 PM (15 years ago)
- Location:
- code/branches/presentation2/src/orxonox
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/LevelManager.cc
r6182 r6256 65 65 { 66 66 SetConfigValue(defaultLevelName_, "presentation_dm.oxw") 67 .description("Sets the pre selection of the level in the main menu.");67 .description("Sets the pre selection of the level in the main menu."); 68 68 } 69 69 -
code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
r6236 r6256 29 29 #include "NewHumanController.h" 30 30 31 #include <cmath> 31 32 #include <OgreRay.h> 32 33 #include <OgreSceneQuery.h> … … 43 44 #include "sound/SoundManager.h" 44 45 #include "Scene.h" 45 46 #include <cmath>47 48 46 49 47 namespace orxonox … … 252 250 void NewHumanController::doUnfire() 253 251 { 254 COUT(0) << "dounfire" << endl;255 252 this->firemode_ = -1; 256 253 hideArrows(); -
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
r6254 r6256 588 588 this->effectsPool_.push_front(it->second); 589 589 it->second->poolIterator_ = this->effectsPool_.begin(); 590 COUT(0) << "pool size: " << this->effectsPoolSize_ << std::endl;591 590 } 592 591 else
Note: See TracChangeset
for help on using the changeset viewer.