Changeset 7163 for code/trunk/src/orxonox/weaponsystem

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)

code/trunk/src/orxonox/weaponsystem/WeaponMode.cc

@@ -274 +274 @@
             return BLANKSTRING;
     }
+
+    void WeaponMode::setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume){
+        if (this->defSndWpnFire_) {
+            this->defSndWpnFire_->setSource(soundPath);
+            this->defSndWpnFire_->setVolume(soundVolume);
+        }
+    }
+
 }

code/trunk/src/orxonox/weaponsystem/WeaponMode.h

@@ -55 +55 @@
             void setDefaultSound(const std::string& soundPath);
             const std::string& getDefaultSound();
-
+            void setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume);
 
             // Munition

code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -214 +214 @@
         Weapon* weapon = 0;
         while ((weapon = wPack->getWeapon(i++)))
-            weapon->getWeaponSlot()->removeWeapon();
+            if (weapon->getWeaponSlot())
+                weapon->getWeaponSlot()->removeWeapon();
 
         // Remove all added links from the WeaponSets