Changeset 6700 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Jan 25, 2006, 3:10:17 PM (18 years ago)

Author:

bensch

Message:

trunk: Energy→Health

File:

• trunk/src/world_entities/world_entity.h (modified) (1 diff)

trunk/src/world_entities/world_entity.h

@@ -87 +87 @@
 
   /** @returns the Energy of the entity */
-  float getEnergy() const { return this->energy; };
+  float getHealth() const { return this->health; };
   /** @returns the Maximum energy this entity can be charged with */
-  float getMaxEnergy() const { return this->energyMax; }
-  float addEnergy(float energy);
-  float removeEnergy(float energy);
-  void setMaxEnergy(float maxEnergy);
-  GLGuiWidget* getEnergyWidget();
+  float getHealthMax() const { return this->healthMax; }
+  float increaseHealth(float health);
+  float decreaseHealth(float health);
+  void increaseHealthMax(float increaseHealth);
+  GLGuiWidget* getHealthWidget();
 
 protected:
-  void setEnergy(float energy) { this->energy = energy; };
-  void setEnergyWidgetVisibilit(bool visibility);
-  void createEnergyWidget();
+  void setHealth(float health) { this->health = health; };
+  void setHealthWidgetVisibilit(bool visibility);
+  void setHealthMax(float healthMax);
+  void createHealthWidget();
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private:
-  void updateEnergyWidget();
+  void updateHealthWidget();
 
 private:
   /// TODO maybe we will move the following three entries and the corresponding functions to Playable AND NPC
-  float                   energy;             //!< The Energy of this Entity, if the Entity has any energy at all.
-  float                   energyMax;          //!< The Maximal energy this entity can take.
-  GLGuiBar*               energyWidget;       //!< The Slider (if wanted).
+  float                   health;             //!< The Energy of this Entity, if the Entity has any energy at all.
+  float                   healthMax;          //!< The Maximal energy this entity can take.
+  GLGuiBar*               healthWidget;       //!< The Slider (if wanted).
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.