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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

Location:

trunk/src/world_entities/projectiles

Files:

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

trunk/src/world_entities/projectiles/projectile.cc

@@ -68 +68 @@
   else if (!explosionSound.empty())
   {
-    this->explosionBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
+    this->explosionBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
     if (this->explosionBuffer != NULL)
     {
@@ -90 +90 @@
   else if (!engineSound.empty())
   {
-    this->engineBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
+    this->engineBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
     if (this->engineBuffer != NULL)
     {

trunk/src/world_entities/projectiles/projectile.h

@@ -52 +52 @@
   protected:
     // energy
-    float                 energyMin;                 //!< The minimal Energy a Projectile needs to be emitted.
-    bool                  bChargeable;               //!< if the Projectile is Charegeable
+    float                  energyMin;                 //!< The minimal Energy a Projectile needs to be emitted.
+    bool                   bChargeable;               //!< if the Projectile is Charegeable
 
-    float                 lifeCycle;                 //!< The percentage of the Lifetime done [0-1]
-    float                 lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
+    float                  lifeCycle;                 //!< The percentage of the Lifetime done [0-1]
+    float                  lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
 
-    Vector                flightDirection;           //!< DOF direction in which the shoot flighs
+    Vector                 flightDirection;           //!< DOF direction in which the shoot flighs
 
-    Vector                velocity;                  //!< velocity of the projectile.
+    Vector                 velocity;                  //!< velocity of the projectile.
 
-    PNode*                target;                    //!< A target for guided Weapons.
+    PNode*                 target;                    //!< A target for guided Weapons.
 
-    SoundSource          soundSource;
+    OrxSound::SoundSource  soundSource;
   private:
-    SoundBuffer*          explosionBuffer;
-    SoundBuffer*          engineBuffer;
+    OrxSound::SoundBuffer* explosionBuffer;
+    OrxSound::SoundBuffer* engineBuffer;
 };