Changeset 6227 for code/branches

Timestamp:

Dec 3, 2009, 5:14:49 PM (15 years ago)

Author:

youngk

Message:

Inserted a firing sound into HsW01. BUG Sound plays only once on first fire.

Location:

code/branches/presentation2/src/modules/weapons/weaponmodes

Files:

• HsW01.cc (modified) (5 diffs)
• HsW01.h (modified) (2 diffs)

code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -42 +42 @@
 #include "worldentities/pawns/Pawn.h"
 
+#include "sound/WorldSound.h"
+
 namespace orxonox
 {
@@ -50 +52 @@
         RegisterObject(HsW01);
 
-        this->reloadTime_ = 0.25;
+        this->reloadTime_ = 0.5;
         this->damage_ = 15;
         this->speed_ = 2500;
@@ -58 +60 @@
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
+
+        this->defSndWpnFire_ = new WorldSound(this);
+        this->defSndWpnFire_->setLooping(false);
+        this->setDefaultSound("sounds/Weapon_Laser_shrt.ogg");
+    }
+
+    HsW01::~HsW01()
+    {
+        if(this->isInitialized())
+        {
+            delete this->defSndWpnFire_;
+        }
     }
 
@@ -92 +106 @@
     void HsW01::fire()
     {
+        this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->attach(this->defSndWpnFire_);
+        this->defSndWpnFire_->play();
+
         this->delayTimer_.startTimer();
+
+        //this->defSndWpnFire_->stop();
     }
 
@@ -123 +142 @@
         HsW01::muendungsfeuer();
     }
+
+    void HsW01::setDefaultSound(const std::string& soundPath)
+    {
+        this->defSndWpnFire_->setSource(soundPath);
+    }
+
+    const std::string& HsW01::getDefaultSound()
+    {
+        return this->defSndWpnFire_->getSource();
+    }
 }

code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.h

@@ -41 +41 @@
         public:
             HsW01(BaseObject* creator);
-            virtual ~HsW01() {}
+            virtual ~HsW01();
 
             virtual void fire();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
+            void setDefaultSound(const std::string& soundPath);
+            const std::string& getDefaultSound();
 
         private:
@@ -58 +61 @@
             float delay_;
             Timer delayTimer_;
+
+            WorldSound* defSndWpnFire_;
     };
 }