Changeset 8724 in orxonox.OLD for trunk/src/lib/collision_reaction/cr_object_damage.cc

Timestamp:

Jun 22, 2006, 3:14:58 PM (19 years ago)

Author:

bensch

Message:

merged the bsp-model-stuff back here

File:

• trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) (2 diffs)

trunk/src/lib/collision_reaction/cr_object_damage.cc

@@ -63 +63 @@
   if( collision->isEntityACollide()) {
     damage = collision->getEntityB()->getDamage();
-    collision->getEntityA()->decreaseHealth(damage);
+    collision->getEntityA()->hit(damage);
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
@@ -69 +69 @@
   if( collision->isEntityBCollide()) {
     damage = collision->getEntityA()->getDamage();
-    collision->getEntityB()->decreaseHealth(damage);
+    collision->getEntityB()->hit(damage);
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());