Changeset 8183 in orxonox.OLD

Timestamp:

Jun 7, 2006, 11:46:00 AM (18 years ago)

Author:

patrick

Message:

cr: work flush

File:

• branches/cr/src/world_entities/world_entity.cc (modified) (3 diffs)

branches/cr/src/world_entities/world_entity.cc

@@ -369 +369 @@
 /**
  * registers a new collision event to this world entity
- *  @param collisionEvent the event
+ *  @param entityA entity of the collision
+ *  @param entityB entity of the collision
+ *  @param bvA colliding bounding volume of entityA
+ *  @param bvB colliding bounding volume of entityA
  */
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
@@ -377 +380 @@
     return false;
 
-  // create a collision event
+  // get a collision event
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
@@ -400 +403 @@
     return false;
 
-  // create a collision event
+  // get a collision event
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h