Changeset 7095 for code/branches/presentation3
- Timestamp:
- Jun 2, 2010, 11:18:00 PM (14 years ago)
- Location:
- code/branches/presentation3/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
r7039 r7095 137 137 138 138 139 140 139 }; 141 140 -
code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
r7056 r7095 37 37 #include "weaponsystem/WeaponSystem.h" 38 38 #include "worldentities/pawns/Pawn.h" 39 #include "sound/WorldSound.h" 39 40 40 41 namespace orxonox … … 52 53 this->speed_ = 500; 53 54 54 this->setMunitionName("LaserMunition"); 55 this->setMunitionName("TargetSeeking Rockets"); 56 this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4); 55 57 // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning) 56 58 } -
code/branches/presentation3/src/orxonox/weaponsystem/WeaponMode.cc
r6417 r7095 274 274 return BLANKSTRING; 275 275 } 276 277 void WeaponMode::setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume){ 278 if (this->defSndWpnFire_) { 279 this->defSndWpnFire_->setSource(soundPath); 280 this->defSndWpnFire_->setVolume(soundVolume); 281 } 282 } 283 276 284 } -
code/branches/presentation3/src/orxonox/weaponsystem/WeaponMode.h
r6417 r7095 55 55 void setDefaultSound(const std::string& soundPath); 56 56 const std::string& getDefaultSound(); 57 57 void setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume); 58 58 59 59 // Munition
Note: See TracChangeset
for help on using the changeset viewer.