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

Timestamp:

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

Author:

bensch

Message:

trunk: Energy→Health

File:

• trunk/src/world_entities/playable.cc (modified) (3 diffs)

trunk/src/world_entities/playable.cc

@@ -22 +22 @@
 #include "state.h"
 
+#include "world_entities/projectiles/projectile.h"
+
 #include "power_ups/weapon_power_up.h"
 #include "power_ups/param_power_up.h"
@@ -97 +99 @@
 {
   if (entity->isA(CL_PROJECTILE))
-    this->removeEnergy(entity->getEnergy());
+    this->decreaseHealth(entity->getHealth());
 
   // EXTREME HACK
-  if (this->getEnergy() == 0.0f)
+  if (this->getHealth() == 0.0f)
     this->deactivateNode();
 }
@@ -166 +168 @@
     switch(ppu->getType()) {
       case POWERUP_PARAM_HEALTH:
-        this->addEnergy(ppu->getValue());
+        this->increaseHealth(ppu->getValue());
         return true;
       case POWERUP_PARAM_MAX_HEALTH:
-        this->setMaxEnergy(this->getMaxEnergy() + ppu->getValue());
+        this->increaseHealthMax(ppu->getValue());
         return true;
     }