Changeset 7460 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

May 1, 2006, 12:30:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

Location:

trunk/src/world_entities/power_ups

Files:

• power_up.cc (modified) (2 diffs)
• power_up.h (modified) (1 diff)

trunk/src/world_entities/power_ups/power_up.cc

@@ -82 +82 @@
   else if (!pickupSound.empty())
   {
-    this->pickupBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
+    this->pickupBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
     if (this->pickupBuffer != NULL)
     {
@@ -103 +103 @@
   else if (!respawnSound.empty())
   {
-    this->respawnBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
+    this->respawnBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
     if (this->respawnBuffer != NULL)
     {

trunk/src/world_entities/power_ups/power_up.h

@@ -45 +45 @@
 
 private:
-  SoundSource         soundSource;
-  SoundBuffer*        pickupBuffer;
-  SoundBuffer*        respawnBuffer;
-  Material*           sphereMaterial;
-  PowerUpRespawn      respawnType;
-  float               respawnTime;
-  float               respawnStart;
-  static const char*  respawnTypes[];
+  OrxSound::SoundSource  soundSource;
+  OrxSound::SoundBuffer* pickupBuffer;
+  OrxSound::SoundBuffer* respawnBuffer;
+  Material*              sphereMaterial;
+  PowerUpRespawn         respawnType;
+  float                  respawnTime;
+  float                  respawnStart;
+  static const char*     respawnTypes[];
 
-  WorldEntity*        collider;
+  WorldEntity*           collider;
 };