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

Timestamp:

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

Author:

bensch

Message:

trunk: Energy→Health

File:

• trunk/src/world_entities/world_entity.cc (modified) (5 diffs)

trunk/src/world_entities/world_entity.cc

@@ -51 +51 @@
 
   this->obbTree = NULL;
-  this->energyWidget = NULL;
-  this->energyMax = 1.0f;
-  this->energy = 1.0f;
+  this->healthWidget = NULL;
+  this->healthMax = 1.0f;
+  this->health = 1.0f;
   this->scaling = 1.0f;
 
@@ -77 +77 @@
     delete this->obbTree;
 
-  if (this->energyWidget != NULL)
-    delete this->energyWidget;
+  if (this->healthWidget != NULL)
+    delete this->healthWidget;
 
   // Delete the model (unregister it with the ResourceManager)
@@ -105 +105 @@
   .defaultValues(3, NULL, 1.0f, 0);
 
-  LoadParam(root, "maxEnergy", this, WorldEntity, setMaxEnergy)
-  .describe("The Maximum energy that can be loaded onto this entity")
+  LoadParam(root, "maxHealth", this, WorldEntity, setHealthMax)
+  .describe("The Maximum health that can be loaded onto this entity")
   .defaultValues(1, 1.0f);
 
-  LoadParam(root, "energy", this, WorldEntity, setEnergy)
-  .describe("The Energy the WorldEntity has at this moment")
+  LoadParam(root, "health", this, WorldEntity, setHealth)
+  .describe("The Health the WorldEntity has at this moment")
   .defaultValues(1, 1.0f);
 }
@@ -343 +343 @@
 
 /**
- * @param energy the Energy to add.
- * @returns the energy left (this->energyMax - energy+this->energy)
- */
-float WorldEntity::addEnergy(float energy)
-{
-  this->energy += energy;
-  if (this->energy > this->energyMax)
-  {
-    float retEnergy = this->energyMax - this->energy;
-    this->energy = this->energyMax;
-    this->updateEnergyWidget();
-    return retEnergy;
-  }
-  this->updateEnergyWidget();
+ * @param health the Health to add.
+ * @returns the health left (this->healthMax - health+this->health)
+ */
+float WorldEntity::increaseHealth(float health)
+{
+  this->health += health;
+  if (this->health > this->healthMax)
+  {
+    float retHealth = this->healthMax - this->health;
+    this->health = this->healthMax;
+    this->updateHealthWidget();
+    return retHealth;
+  }
+  this->updateHealthWidget();
   return 0.0;
 }
 
 /**
- * @param energy the Energy to be removed
+ * @param health the Health to be removed
  * @returns 0.0 or the rest, that was not substracted (bellow 0.0)
  */
-float WorldEntity::removeEnergy(float energy)
-{
-  this->energy -= energy;
-
-  if (this->energy < 0)
-  {
-    float retEnergy = -this->energy;
-    this->energy = 0.0f;
-    this->updateEnergyWidget();
-    return retEnergy;
-  }
-  this->updateEnergyWidget();
+float WorldEntity::decreaseHealth(float health)
+{
+  this->health -= health;
+
+  if (this->health < 0)
+  {
+    float retHealth = -this->health;
+    this->health = 0.0f;
+    this->updateHealthWidget();
+    return retHealth;
+  }
+  this->updateHealthWidget();
   return 0.0;
 
@@ -381 +381 @@
 
 /**
- * @param maxEnergy the maximal energy that can be loaded onto the entity.
- */
-void WorldEntity::setMaxEnergy(float maxEnergy)
-{
-  this->energyMax = maxEnergy;
-  if (this->energy > this->energyMax)
-  {
-    PRINTF(3)("new maxEnergy is bigger as the old energy. Did you really intend to do this for (%s::%s)\n", this->getClassName(), this->getName());
-    this->energy = this->energyMax;
-  }
-  this->updateEnergyWidget();
-}
-
-/**
- * @brief creates the EnergyWidget
- *
- * since not all entities need an EnergyWidget, it is only created on request.
- */
-void WorldEntity::createEnergyWidget()
-{
-  if (this->energyWidget == NULL)
-  {
-    this->energyWidget = new GLGuiBar();
-    this->energyWidget->setSize2D(30,400);
-    this->energyWidget->setAbsCoor2D(10,100);
-
-    this->updateEnergyWidget();
+ * @param maxHealth the maximal health that can be loaded onto the entity.
+ */
+void WorldEntity::setHealthMax(float healthMax)
+{
+  this->healthMax = healthMax;
+  if (this->health > this->healthMax)
+  {
+    PRINTF(3)("new maxHealth is bigger as the old health. Did you really intend to do this for (%s::%s)\n", this->getClassName(), this->getName());
+    this->health = this->healthMax;
+  }
+  this->updateHealthWidget();
+}
+
+/**
+ * @brief creates the HealthWidget
+ *
+ * since not all entities need an HealthWidget, it is only created on request.
+ */
+void WorldEntity::createHealthWidget()
+{
+  if (this->healthWidget == NULL)
+  {
+    this->healthWidget = new GLGuiBar();
+    this->healthWidget->setSize2D(30,400);
+    this->healthWidget->setAbsCoor2D(10,100);
+
+    this->updateHealthWidget();
   }
   else
-    PRINTF(3)("Allready created the EnergyWidget for %s::%s\n", this->getClassName(), this->getName());
-}
-
-GLGuiWidget* WorldEntity::getEnergyWidget()
-{
-  this->createEnergyWidget();
-  return this->energyWidget;
-}
-
-/**
- * @param visibility shows or hides the energy-bar
+    PRINTF(3)("Allready created the HealthWidget for %s::%s\n", this->getClassName(), this->getName());
+}
+
+void WorldEntity::increaseHealthMax(float increaseHealth)
+{
+  this->healthMax += increaseHealth;
+  this->updateHealthWidget();
+}
+
+
+GLGuiWidget* WorldEntity::getHealthWidget()
+{
+  this->createHealthWidget();
+  return this->healthWidget;
+}
+
+/**
+ * @param visibility shows or hides the health-bar
  * (creates the widget if needed)
  */
-void WorldEntity::setEnergyWidgetVisibilit(bool visibility)
+void WorldEntity::setHealthWidgetVisibilit(bool visibility)
 {
     if (visibility)
     {
-      if (this->energyWidget != NULL)
-        this->energyWidget->show();
+      if (this->healthWidget != NULL)
+        this->healthWidget->show();
       else
       {
-        this->createEnergyWidget();
-        this->updateEnergyWidget();
-        this->energyWidget->show();
+        this->createHealthWidget();
+        this->updateHealthWidget();
+        this->healthWidget->show();
       }
     }
-    else if (this->energyWidget != NULL)
-      this->energyWidget->hide();
-}
-
-/**
- * @brief updates the EnergyWidget
- */
-void WorldEntity::updateEnergyWidget()
-{
-  if (this->energyWidget != NULL)
-  {
-    this->energyWidget->setMaximum(this->energyMax);
-    this->energyWidget->setValue(this->energy);
+    else if (this->healthWidget != NULL)
+      this->healthWidget->hide();
+}
+
+/**
+ * @brief updates the HealthWidget
+ */
+void WorldEntity::updateHealthWidget()
+{
+  if (this->healthWidget != NULL)
+  {
+    this->healthWidget->setMaximum(this->healthMax);
+    this->healthWidget->setValue(this->health);
   }
 }