Changeset 7216 in orxonox.OLD for branches/std/src/world_entities/power_ups

Timestamp:

Mar 12, 2006, 8:54:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/std:: compile and run again, with many more std::strings….

Location:

branches/std/src/world_entities/power_ups

Files:

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

branches/std/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;

branches/std/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[];
+
 };
 

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

@@ -182 +182 @@
   };
 
-void PowerUp::setRespawnType(const char* type)
+
+void PowerUp::setRespawnType(const std::string& type)
 {
   for(int i = 0; i < RESPAWN_size; ++i)
   {
-    if(!strcmp(type, respawnTypes[i]))
+    if(type == respawnTypes[i])
     {
       this->respawnType = (PowerUpRespawn)i;

branches/std/src/world_entities/power_ups/power_up.h

@@ -31 +31 @@
   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;
 };