Changeset 8264 in orxonox.OLD for branches/bsp_model/src/lib/collision_reaction

Timestamp:

Jun 8, 2006, 4:19:39 PM (18 years ago)

Author:

patrick

Message:

bsp: fixed a bug in the cr engine. now the checks are performed correctly

File:

• branches/bsp_model/src/lib/collision_reaction/collision_handle.cc (modified) (1 diff)

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

@@ -221 +221 @@
 bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
 {
-  if( this->type == CREngine::CR_PHYSICS_GROUND_WALK)
-  {
-
-    vector<long>::iterator it = this->targetList.begin();
-    for(; it < this->targetList.end(); it++)
-    {
-      PRINTF(0)("filtering: %i vs EntityA %i, EntityB %i \n", *it, collisionEvent->getEntityA()->getClassID(), collisionEvent->getEntityB()->getClassID());
-
-    }
-  }
-
   vector<long>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {
     if( collisionEvent->getEntityA() == this->owner) {
+      if( collisionEvent->getEntityB()->isA((ClassID)(*it)))
+        return true; }
+    else {
       if( collisionEvent->getEntityA()->isA((ClassID)(*it)))
         return true; }
-    else {
-      if( collisionEvent->getEntityB()->isA((ClassID)(*it)))
-        return true; }
-  }
+  }
+
 
   return false;