Changeset 8490 in orxonox.OLD for trunk/src/lib/collision_reaction/cr_engine.cc

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/cr_engine.cc (modified) (2 diffs)

trunk/src/lib/collision_reaction/cr_engine.cc

@@ -126 +126 @@
 {
   std::vector<CollisionHandle*>::iterator it;
-  for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
-  {
-    if( *it == collisionHandle)
-    {
+  for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)  {
+    if( *it == collisionHandle) {
       this->collisionHandles.erase(it);
       delete collisionHandle;
@@ -147 +145 @@
   for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
   {
-    if( (*it)->isCollided() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
+    if( !(*it)->isDispatched() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
     {
       (*it)->handleCollisions();