Changeset 8854 in orxonox.OLD for branches/multi_player_map/src/lib/collision_reaction

Timestamp:

Jun 28, 2006, 2:42:19 PM (18 years ago)

Author:

patrick

Message:

multiplayer: kill and hit event extended for event tracing

File:

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

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

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