Changeset 8219 in orxonox.OLD for branches/bsp_model/src/world_entities/world_entity.cc

Timestamp:

Jun 7, 2006, 10:15:00 PM (18 years ago)

Author:

patrick

Message:

bsp: new ground collision attribute tripple

File:

• branches/bsp_model/src/world_entities/world_entity.cc (modified) (2 diffs)

branches/bsp_model/src/world_entities/world_entity.cc

@@ -410 +410 @@
  *  @param position it collides on the plane
  */
-bool WorldEntity::registerCollision(WorldEntity* entity, Vector normal, Vector position)
+bool WorldEntity::registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position)
 {
   // is there any handler listening?
@@ -419 +419 @@
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(entity, normal, position);
+  c->collide(entity, groundEntity, normal, position);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)