Changeset 8490 in orxonox.OLD for trunk/src/lib/collision_reaction/collision.h

Timestamp:

Jun 15, 2006, 9:34:48 PM (18 years ago)

Author:

patrick

Message:

merged the bsp branche back to trunk

File:

• trunk/src/lib/collision_reaction/collision.h (modified) (2 diffs)

trunk/src/lib/collision_reaction/collision.h

@@ -27 +27 @@
 
     /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */
-    inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; }
+    inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; this->bDispatched = false; }
 
 
@@ -42 +42 @@
     /** sets the flag if it reacts @param flag true if it should react on entityB*/
     inline void setEntityBCollide(bool flag) { this->entityACollide = flag; }
+
 
     /** @returns true if this Collision has already been dispatched */