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

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/world_entities/projectiles

Files:

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

trunk/src/world_entities/projectiles/projectile.cc

@@ -61 +61 @@
 
 
-void Projectile::loadExplosionSound(const char* explosionSound)
+void Projectile::loadExplosionSound(const std::string& explosionSound)
 {
   if (this->explosionBuffer != NULL)
     ResourceManager::getInstance()->unload(this->explosionBuffer);
 
-  else if (explosionSound != NULL)
+  else if (!explosionSound.empty())
   {
     this->explosionBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
     if (this->explosionBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound, this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound.c_str(), this->getName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound, this->getName());
+      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound.c_str(), this->getName());
     }
   }
@@ -83 +83 @@
 
 
-void Projectile::loadEngineSound(const char* engineSound)
+void Projectile::loadEngineSound(const std::string& engineSound)
 {
   if (this->engineBuffer != NULL)
     ResourceManager::getInstance()->unload(this->engineBuffer);
 
-  else if (engineSound != NULL)
+  else if (!engineSound.empty())
   {
     this->engineBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
     if (this->engineBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound, this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound.c_str(), this->getName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound, this->getName());
+      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound.c_str(), this->getName());
     }
   }

trunk/src/world_entities/projectiles/projectile.h

@@ -26 +26 @@
     void setLifeSpan(float lifeSpan);
 
-    void loadExplosionSound(const char* explosionSound);
-    void loadEngineSound(const char* engineSound);
+    void loadExplosionSound(const std::string& explosionSound);
+    void loadEngineSound(const std::string& engineSound);
     void setMinEnergy(float energyMin);
     /** @returns the minimal charched energy */