Changeset 8169 in orxonox.OLD for branches/cr/src/lib/collision_reaction

Timestamp:

Jun 6, 2006, 2:05:33 AM (19 years ago)

Author:

patrick

Message:

cr: using a new damage structure for dealing damage. working

File:

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

branches/cr/src/lib/collision_reaction/cr_object_damage.cc

@@ -60 +60 @@
   // the collision damage been dealed by the entity
   if( collision->isEntityACollide()) {
-    damage = collision->getEntityB()->getHealthMax();
+    damage = collision->getEntityB()->getDamage();
     collision->getEntityA()->decreaseHealth(damage);
   }
@@ -66 +66 @@
 
   if( collision->isEntityBCollide()) {
-    damage = collision->getEntityA()->getHealthMax();
+    damage = collision->getEntityA()->getDamage();
     collision->getEntityB()->decreaseHealth(damage);
   }