Changeset 7066 in orxonox.OLD

Timestamp:

Feb 7, 2006, 1:29:17 PM (18 years ago)

Author:

bensch

Message:

powerup respawn sound

Location:

trunk/src/world_entities/power_ups

Files:

• power_up.cc (modified) (7 diffs)
• power_up.h (modified) (2 diffs)

trunk/src/world_entities/power_ups/power_up.cc

@@ -45 +45 @@
 
   this->soundSource.setSourceNode(this);
-  this->soundBuffer = NULL;
+  this->pickupBuffer = NULL;
+  this->respawnBuffer = NULL;
 }
 
@@ -51 +52 @@
 {
   delete this->sphereMaterial;
-  if (this->soundBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->soundBuffer);
+  if (this->pickupBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->pickupBuffer);
+  if (this->respawnBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->respawnBuffer);
 }
 
@@ -65 +68 @@
 
   LoadParam(root, "pickup-sound", this, PowerUp, loadPickupSound);
+
+  LoadParam(root, "respawn-sound", this, PowerUp, loadRespawnSound);
 }
 
@@ -70 +75 @@
 void PowerUp::loadPickupSound(const char* pickupSound)
 {
-  if (this->soundBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->soundBuffer);
+  if (this->pickupBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->pickupBuffer);
 
   else if (pickupSound != NULL)
 {
-  this->soundBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
-  if (this->soundBuffer != NULL)
+  this->pickupBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
+  if (this->pickupBuffer != NULL)
   {
     PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound, this->getName());
@@ -86 +91 @@
 }
   else
-    this->soundBuffer = NULL;
-}
+    this->pickupBuffer = NULL;
+}
+
+void PowerUp::loadRespawnSound(const char* respawnSound)
+{
+  if (this->respawnBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->respawnBuffer);
+
+  else if (respawnSound != NULL)
+  {
+    this->respawnBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
+    if (this->respawnBuffer != NULL)
+    {
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound, this->getName());
+    }
+    else
+    {
+      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound, this->getName());
+    }
+  }
+  else
+    this->respawnBuffer = NULL;
+}
+
 
 void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
@@ -95 +122 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
-      if(soundBuffer != NULL)
-        this->soundSource.play(this->soundBuffer);
+      if(pickupBuffer != NULL)
+        this->soundSource.play(this->pickupBuffer);
 
       switch(respawnType) {
@@ -114 +141 @@
   if(this->getOMListNumber() != OM_COMMON) {
     this->respawnTime -= dt;
-    if(this->respawnTime <= 0) {
+    if(this->respawnTime <= 0)
+    {
       this->toList(OM_COMMON);
+      this->soundSource.play(this->respawnBuffer);
+
     }
   }

trunk/src/world_entities/power_ups/power_up.h

@@ -27 +27 @@
 
   void loadPickupSound(const char* pickupSound);
+  void loadRespawnSound(const char* pickupSound);
 
   virtual void draw () const;
@@ -43 +44 @@
 private:
   SoundSource    soundSource;
-  SoundBuffer*   soundBuffer;
+  SoundBuffer*   pickupBuffer;
+  SoundBuffer*   respawnBuffer;
   Material* sphereMaterial;
   PowerUpRespawn respawnType;