Changeset 6247

Timestamp:

Dec 4, 2009, 6:05:39 PM (14 years ago)

Author:

youngk

Message:

Implemented exhaust sound for rocket. Explosion sounds of any sort (either Rocket or Ship) do not work yet.
BUG Firing sound won't attach to HsW01 specifically. Other weapons work.

Location:

code/branches/presentation2/src/modules/weapons/projectiles

Files:

• Rocket.cc (modified) (5 diffs)
• Rocket.h (modified) (1 diff)

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -39 +39 @@
 #include "worldentities/CameraPosition.h"
 
+#include "sound/WorldSound.h"
+
 namespace orxonox
 {
@@ -86 +88 @@
         camPosition->setAllowMouseLook(true);
         this->addCameraPosition(camPosition);
-    }
-
-    /**
-    @brief
-        Destructor. Destroys controller, if present.
+
+        this->defSndWpnEngine_ = new WorldSound(this);
+        this->defSndWpnEngine_->setLooping(true);
+        this->defSndWpnEngine_->setSource("sounds/Rocket_Engine.ogg");
+        this->attach(defSndWpnEngine_);
+    }
+
+    /**
+    @brief
+        Destructor. Destroys controller, if present and kills sounds, if playing.
     */
     Rocket::~Rocket()
@@ -97 +104 @@
         {
             if (GameMode::isMaster() && this->player_)
+            {
                 this->player_->stopTemporaryControl();
+            }
+            if(this->defSndWpnEngine_->isPlaying())
+            {
+                this->defSndWpnEngine_->stop();
+            }
+            delete this->defSndWpnEngine_;
         }
     }
@@ -117 +131 @@
         this->player_ = this->owner_->getPlayer();
         this->owner_->getPlayer()->startTemporaryControl(this);
+
+        this->defSndWpnEngine_->play();
     }
 
@@ -185 +201 @@
     {
         if (GameMode::isMaster())
+        {
+            if(this->defSndWpnEngine_->isPlaying())
+            {
+                this->defSndWpnEngine_->stop();
+            }
             this->destroy();
+        }
     }
     

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h

@@ -122 +122 @@
             Timer destroyTimer_;
             float lifetime_;
+
+            WorldSound* defSndWpnEngine_;
+            WorldSound* defSndWpnExplosion_;
     };