Changeset 5873 in orxonox.OLD

Timestamp:

Dec 2, 2005, 3:21:58 PM (18 years ago)

Author:

manuel

Message:

powerup and extendable work

Location:

branches/powerups/src/world_entities/power_ups

Files:

• power_up.cc (modified) (1 diff)
• power_up.h (modified) (1 diff)

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

@@ -23 +23 @@
 using namespace std;
 
-
-
-PowerUp::PowerUp (PowerUpType type)
-{
-  this->init();
-}
-
-PowerUp::PowerUp(const TiXmlElement* root)
-{
-  this->init();
-  this->loadParams(root);
-}
-
-void PowerUp::init() {
-  this->setClassID(CL_POWER_UP, "PowerUp");
-  this->type = type;
-}
+PowerUp::PowerUp() { }
 
 PowerUp::~PowerUp () {}

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

@@ -9 +9 @@
 #include "world_entity.h"
 
-typedef enum PowerUpType
-{
-  PWR_UP_NULL,
-  PWR_UP_SHIELD,
-  PWR_UP_WEAPON,
-} PowerUpType;
-
 class PowerUp : public WorldEntity {
 
 public:
-  PowerUp(PowerUpType type = PWR_UP_NULL);
-  PowerUp(const TiXmlElement* root);
-  virtual ~PowerUp ();
   void loadParams(const TiXmlElement* root);
   void collidesWith (WorldEntity* entity, const Vector& location);
 
-private:
-  PowerUpType type;
-  void init();
+protected:
+  PowerUp();
+  virtual ~PowerUp ();
 };