Changeset 9805 in orxonox.OLD for branches/new_class_id/src/world_entities/power_ups/power_up.cc

Timestamp:

Sep 24, 2006, 3:21:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: SoundSource completely added as a Resource

File:

• branches/new_class_id/src/world_entities/power_ups/power_up.cc (modified) (6 diffs)

branches/new_class_id/src/world_entities/power_ups/power_up.cc

@@ -21 +21 @@
 #include "primitive_model.h"
 
-#include "util/loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 #include "util/loading/load_param.h"
 
@@ -47 +47 @@
 
   this->soundSource.setSourceNode(this);
-  this->pickupBuffer = NULL;
-  this->respawnBuffer = NULL;
 
   this->collider = NULL;
@@ -56 +54 @@
 {
   delete this->sphereMaterial;
-  if (this->pickupBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->pickupBuffer);
-  if (this->respawnBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->respawnBuffer);
 }
 
@@ -79 +73 @@
 void PowerUp::loadPickupSound(const std::string& pickupSound)
 {
-  if (this->pickupBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->pickupBuffer);
-
-  else if (!pickupSound.empty())
-  {
-    this->pickupBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
-    if (this->pickupBuffer != NULL)
-    {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound.c_str(), this->getCName());
-    }
-    else
-    {
-      PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound.c_str(), this->getCName());
-    }
-  }
+  if (!pickupSound.empty())
+    this->pickupBuffer = OrxSound::ResourceSoundBuffer(pickupSound);
   else
-    this->pickupBuffer = NULL;
+    this->pickupBuffer = OrxSound::SoundBuffer();
 }
 
 void PowerUp::loadRespawnSound(const std::string& respawnSound)
 {
-  if (this->respawnBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->respawnBuffer);
-
-  else if (!respawnSound.empty())
-  {
-    this->respawnBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
-    if (this->respawnBuffer != NULL)
-    {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound.c_str(), this->getCName());
-    }
-    else
-    {
-      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound.c_str(), this->getCName());
-    }
-  }
+  if (!respawnSound.empty())
+    this->respawnBuffer = OrxSound::ResourceSoundBuffer(respawnSound);
   else
-    this->respawnBuffer = NULL;
+    this->respawnBuffer = OrxSound::SoundBuffer();
 }
 
@@ -127 +95 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
-      if(pickupBuffer != NULL)
+      if(pickupBuffer.loaded())
         this->soundSource.play(this->pickupBuffer);
 
@@ -156 +124 @@
       this->toList(OM_COMMON);
       this->collider = NULL;
-      if (likely(this->respawnBuffer != NULL))
+      if (likely(this->respawnBuffer.loaded()))
         this->soundSource.play(this->respawnBuffer);