Changeset 8126 in orxonox.OLD for branches

Timestamp:

Jun 3, 2006, 3:04:07 PM (19 years ago)

Author:

patrick

Message:

cr: more logical errors removed from the code - multikill

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (4 diffs)
• cr_engine.cc (modified) (1 diff)

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

@@ -121 +121 @@
   // set the state to not dispatched
   this->bDispatched = false;
+  this->bCollided = true;
   collision->setEntityBCollide(true);
 
@@ -138 +139 @@
   // set the state to not dispatched
   this->bDispatched = false;
+  this->bCollided = true;
 
   // checks if these WorldEntities have already collided or if its a new collision -> create a new Collision object
@@ -163 +165 @@
   // collision reaction calculations (for every collision there will be a reaction)
   vector<Collision*>::iterator it = this->collisionList.begin();
-  for(; it < this->collisionList.end(); it++)
-  {
+  for(; it < this->collisionList.end(); it++) {
     (*it)->handleCollisionEvents();
   }
@@ -171 +172 @@
   this->bDispatched = true;
   this->bCollided = false;
+
   this->flushCollisions();
 }

branches/cr/src/lib/collision_reaction/cr_engine.cc

@@ -145 +145 @@
   for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
   {
-    if( (*it)->isCollided())  //does it have any collisions to report at all
+    if( (*it)->isCollided() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
     {
       (*it)->handleCollisions();