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

Timestamp:

Jul 2, 2006, 2:22:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:

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

trunk/src/lib/collision_reaction/cr_object_damage.cc

@@ -56 +56 @@
   float damage = 0.0f;
 
-  PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
+  PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
             collision->getEntityB()->getClassName());
@@ -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());