Changeset 8167 in orxonox.OLD

Timestamp:

Jun 6, 2006, 1:39:46 AM (18 years ago)

Author:

patrick

Message:

cr: collision reaction now works: dealing damage

File:

• branches/cr/src/lib/collision_reaction/collision_handle.cc (modified) (3 diffs)

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

@@ -114 +114 @@
     c->collide(entityA, entityB);
     this->collisionList.push_back(c);
+
+    // now register it as a shared collision with the other collision entity
+    CollisionHandle* ch = entityB->getCollisionHandle(this->type);
+    if( ch != NULL)
+      ch->registerSharedCollision(c);
   }
   else
@@ -120 +125 @@
   assert( c->getEntityA() != NULL);
   assert( c->getEntityB() != NULL);
-
-  // now register it as a shared collision with the other collision entity
-  CollisionHandle* ch = entityB->getCollisionHandle(this->type);
-  if( ch != NULL)
-    ch->registerSharedCollision(c);
 
   return c;
@@ -190 +190 @@
   vector<Collision*>::iterator it = this->collisionList.begin();
   for(; it < this->collisionList.end(); it++) {
-    this->collisionReaction->reactToCollision(*it);
-    (*it)->flushCollisionEvents();
+    if( !(*it)->isDispatched())
+    {
+      this->collisionReaction->reactToCollision(*it);
+      (*it)->flushCollisionEvents();
+    }
   }