Changeset 8168 in orxonox.OLD

Timestamp:

Jun 6, 2006, 1:49:45 AM (18 years ago)

Author:

patrick

Message:

cr: less and better debug output

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• lib/collision_reaction/cr_object_damage.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -122 +122 @@
   else
     c = this->collisionList.back();
-
-  assert( c->getEntityA() != NULL);
-  assert( c->getEntityB() != NULL);
 
   return c;

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

@@ -54 +54 @@
   float damage;
 
-  assert(collision->getEntityA() != NULL);
-  assert(collision->getEntityB() != NULL);
-
   PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
@@ -66 +63 @@
     collision->getEntityA()->decreaseHealth(damage);
   }
+  PRINTF(0)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
+
   if( collision->isEntityBCollide()) {
     damage = collision->getEntityA()->getHealthMax();
     collision->getEntityB()->decreaseHealth(damage);
   }
+  PRINTF(0)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());
 
   collision->flushCollisionEvents();

branches/cr/src/world_entities/world_entity.cc

@@ -376 +376 @@
     return false;
 
-  PRINTF(0)("Registering Collision: %s vs %s \n", entityA->getClassName(), entityB->getClassName());
   // create a collision event
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();