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

Timestamp:

Jul 3, 2006, 6:39:10 PM (19 years ago)

Author:

patrick

Message:

merged the single_player branche to trunk

File:

• trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) (1 diff)

trunk/src/lib/collision_reaction/cr_object_damage.cc

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