- Timestamp:
- Dec 21, 2009, 1:28:10 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
r6387 r6388 254 254 } 255 255 256 float SoundManager::getVolume(SoundType::Value type) 256 float SoundManager::getVolume(SoundType::Value type) 257 257 { 258 258 if (type < 0 || type > SoundType::Effects) … … 261 261 } 262 262 263 float SoundManager::getRealVolume(SoundType::Value type) 263 float SoundManager::getRealVolume(SoundType::Value type) 264 264 { 265 265 if (type != SoundType::Music && type != SoundType::Effects) … … 339 339 } 340 340 341 if (!this->ambientSounds_.empty()) 341 if (!this->ambientSounds_.empty()) 342 342 { 343 343 this->fadeOut(ambientSounds_.front().first); … … 354 354 return; 355 355 356 if (this->ambientSounds_.front().first == oldAmbient) 356 if (this->ambientSounds_.front().first == oldAmbient) 357 357 { 358 358 this->fadeOut(oldAmbient);
Note: See TracChangeset
for help on using the changeset viewer.