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

Timestamp:

Jan 17, 2006, 10:01:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loadParams is now virtual.
ALL THE CLASSES HAVE TO CALL

SuperClass::loadParams(root);

isntead of:
static_cast<SuperClass*>(this)→loadParams(root);

which was quite stupid anyways

Location:

trunk/src/world_entities/power_ups

Files:

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

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -65 +65 @@
 void LaserPowerUp::loadParams(const TiXmlElement* root)
 {
-  static_cast<PowerUp*>(this)->loadParams(root);
+  PowerUp::loadParams(root);
 
 }

trunk/src/world_entities/power_ups/laser_power_up.h

@@ -19 +19 @@
   virtual ~LaserPowerUp ();
 
+  virtual void loadParams(const TiXmlElement* root);
+
+
   virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
@@ -28 +31 @@
   private:
    void init();
-   void loadParams(const TiXmlElement* root);
 
   private:

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -63 +63 @@
 void ParamPowerUp::loadParams(const TiXmlElement* root)
 {
-  static_cast<PowerUp*>(this)->loadParams(root);
+  PowerUp::loadParams(root);
   LoadParam(root, "type", this, ParamPowerUp, setType);
 

trunk/src/world_entities/power_ups/param_power_up.h

@@ -38 +38 @@
 private:
   void init();
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
 private:

trunk/src/world_entities/power_ups/power_up.cc

@@ -48 +48 @@
 void PowerUp::loadParams(const TiXmlElement* root)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
+  WorldEntity::loadParams(root);
 }
 

trunk/src/world_entities/power_ups/power_up.h

@@ -20 +20 @@
 
 public:
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
   void collidesWith (WorldEntity* entity, const Vector& location);
 

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -65 +65 @@
 void TurretPowerUp::loadParams(const TiXmlElement* root)
 {
-  static_cast<PowerUp*>(this)->loadParams(root);
+  PowerUp::loadParams(root);
 
 }

trunk/src/world_entities/power_ups/turret_power_up.h

@@ -19 +19 @@
   virtual ~TurretPowerUp ();
 
+  virtual void loadParams(const TiXmlElement* root);
+
   virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
   virtual void tick(float dt);
@@ -28 +30 @@
   private:
    void init();
-   void loadParams(const TiXmlElement* root);
 
   private:

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -57 +57 @@
 void WeaponPowerUp::loadParams(const TiXmlElement* root)
 {
-  static_cast<PowerUp*>(this)->loadParams(root);
+  PowerUp::loadParams(root);
   const TiXmlElement* elem = root->FirstChildElement("weapon");
   if(elem != NULL && (elem = elem->FirstChildElement()) != NULL)

trunk/src/world_entities/power_ups/weapon_power_up.h

@@ -19 +19 @@
   virtual ~WeaponPowerUp ();
 
+  virtual void loadParams(const TiXmlElement* root);
+
   Weapon* getWeapon();
   void setWeaponClass(const char* name);
@@ -30 +32 @@
 private:
   void init();
-  void loadParams(const TiXmlElement* root);
 private:
   Weapon* weapon;