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

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/power_ups

Files:

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

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -81 +81 @@
 }
 
-void ParamPowerUp::setType(const char* type)
+void ParamPowerUp::setType(const std::string& type)
 {
   for(int i = 0; i < POWERUP_PARAM_size; ++i) {
-    if(strcmp(type, paramTypes[i]) == 0) {
+    if(type == paramTypes[i]) {
       this->type = (EnumParamPowerUpType)i;
       break;

trunk/src/world_entities/power_ups/param_power_up.h

@@ -28 +28 @@
   void setMaxValue(float value);
   void setMinValue(float value);
-  void setType(const char* type);
+  void setType(const std::string& type);
   EnumParamPowerUpType getType();
   float getValue();
@@ -43 +43 @@
 
 private:
-  static const char* paramTypes[];
-  EnumParamPowerUpType type;
-  float value;
-  float max_value;
-  float min_value;
+  EnumParamPowerUpType    type;
+  float                   value;
+  float                   max_value;
+  float                   min_value;
+
+  static const char*      paramTypes[];
+
 };
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -33 +33 @@
   this->respawnStart = 10;
   this->model = NULL;
-/*  if(!PowerUp::sphereModel) {*/
+  /*  if(!PowerUp::sphereModel) {*/
 
   Model* sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
@@ -75 +75 @@
 
 
-void PowerUp::loadPickupSound(const char* pickupSound)
+void PowerUp::loadPickupSound(const std::string& pickupSound)
 {
   if (this->pickupBuffer != NULL)
     ResourceManager::getInstance()->unload(this->pickupBuffer);
 
-  else if (pickupSound != 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());
-  }
-  else
-  {
-    PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound, this->getName());
-  }
-}
+  else if (!pickupSound.empty())
+  {
+    this->pickupBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
+    if (this->pickupBuffer != NULL)
+    {
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound.c_str(), this->getName());
+    }
+    else
+    {
+      PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound.c_str(), this->getName());
+    }
+  }
   else
     this->pickupBuffer = NULL;
 }
 
-void PowerUp::loadRespawnSound(const char* respawnSound)
+void PowerUp::loadRespawnSound(const std::string& respawnSound)
 {
   if (this->respawnBuffer != NULL)
     ResourceManager::getInstance()->unload(this->respawnBuffer);
 
-  else if (respawnSound != NULL)
+  else if (!respawnSound.empty())
   {
     this->respawnBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
     if (this->respawnBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound, this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound.c_str(), this->getName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound, this->getName());
+      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound.c_str(), this->getName());
     }
   }
@@ -128 +128 @@
         this->soundSource.play(this->pickupBuffer);
 
-      switch(respawnType) {
-        case RESPAWN_NONE:
-          this->toList(OM_DEAD);
-          break;
-        case RESPAWN_TIME:
-          this->toList(OM_DEAD_TICK);
-          this->respawnTime = this->respawnStart;
-          break;
+      switch(respawnType)
+      {
+      case RESPAWN_NONE:
+        this->toList(OM_DEAD);
+        break;
+      case RESPAWN_TIME:
+        this->toList(OM_DEAD_TICK);
+        this->respawnTime = this->respawnStart;
+        break;
       }
     }
@@ -141 +142 @@
 }
 
-void PowerUp::tick(float dt) {
-  if(this->getOMListNumber() != OM_COMMON) {
+void PowerUp::tick(float dt)
+{
+  if(this->getOMListNumber() != OM_COMMON)
+  {
     this->respawnTime -= dt;
     if(this->respawnTime <= 0)
@@ -157 +160 @@
 void PowerUp::draw() const
 {
-  if(this->model != NULL) {
+  if(this->model != NULL)
+  {
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
@@ -172 +176 @@
 }
 
-const char* PowerUp::respawnTypes[] = {
-  "none",
-  "time"
-};
-
-void PowerUp::setRespawnType(const char* type)
-{
-  for(int i = 0; i < RESPAWN_size; ++i) {
-    if(!strcmp(type, respawnTypes[i])) {
+const char* PowerUp::respawnTypes[] =
+  {
+    "none",
+    "time"
+  };
+
+
+void PowerUp::setRespawnType(const std::string& type)
+{
+  for(int i = 0; i < RESPAWN_size; ++i)
+  {
+    if(type == respawnTypes[i])
+    {
       this->respawnType = (PowerUpRespawn)i;
       break;

trunk/src/world_entities/power_ups/power_up.h

@@ -26 +26 @@
   void collidesWith (WorldEntity* entity, const Vector& location);
 
-  void loadPickupSound(const char* pickupSound);
-  void loadRespawnSound(const char* pickupSound);
+  void loadPickupSound(const std::string& pickupSound);
+  void loadRespawnSound(const std::string& respawnSound);
 
   virtual void draw () const;
   virtual void tick(float dt);
-  void setRespawnType(const char* type);
+  void setRespawnType(const std::string& type);
   void setRespawnTime(const float respawn);
 
@@ -45 +45 @@
 
 private:
-  SoundSource    soundSource;
-  SoundBuffer*   pickupBuffer;
-  SoundBuffer*   respawnBuffer;
-  Material* sphereMaterial;
-  PowerUpRespawn respawnType;
-  float respawnTime;
-  float respawnStart;
-  static const char* respawnTypes[];
+  SoundSource         soundSource;
+  SoundBuffer*        pickupBuffer;
+  SoundBuffer*        respawnBuffer;
+  Material*           sphereMaterial;
+  PowerUpRespawn      respawnType;
+  float               respawnTime;
+  float               respawnStart;
+  static const char*  respawnTypes[];
 
-  WorldEntity* collider;
+  WorldEntity*        collider;
 };
 

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -92 +92 @@
 }
 
-void WeaponPowerUp::setWeaponClass(const char* name)
+void WeaponPowerUp::setWeaponClass(const std::string& name)
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
   if (this->weapon == NULL)
   {
-    PRINTF(1)("Unable to load Weapon. %s\n", name);
+    PRINTF(1)("Unable to load Weapon. %s\n", name.c_str());
     this->weapon = dynamic_cast<Weapon*>(Factory::fabricate("Turret"));
   }

trunk/src/world_entities/power_ups/weapon_power_up.h

@@ -22 +22 @@
 
   Weapon* getWeapon();
-  void setWeaponClass(const char* name);
+  void setWeaponClass(const std::string& name);
 
   virtual int writeBytes(const byte* data, int length, int sender);