Changeset 8166 in orxonox.OLD

Timestamp:

Jun 6, 2006, 1:33:36 AM (18 years ago)

Author:

patrick

Message:

cr: more bugs found. its amazing

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision.cc (modified) (1 diff)
• collision_handle.cc (modified) (2 diffs)
• cr_object_damage.cc (modified) (1 diff)

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

@@ -27 +27 @@
 Collision::Collision ()
 {
-  this->entityA = NULL;
-  this->entityB = NULL;
-
-  this->bDispatched = false;
-  this->entityACollide = false;
-  this->entityBCollide = false;
+  this->flushCollisionEvents();
 }
 

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

@@ -110 +110 @@
   Collision* c;
   if( this->collisionList.empty() ||
-      ((this->collisionList.back())->getEntityA() != entityA && (this->collisionList.back())->getEntityB() != entityB ))
+      ((this->collisionList.back())->getEntityA() != entityA && (this->collisionList.back())->getEntityB() != entityB )) {
     c = CREngine::getInstance()->popCollisionObject();
+    c->collide(entityA, entityB);
+    this->collisionList.push_back(c);
+  }
   else
     c = this->collisionList.back();
 
-  assert( entityA != NULL);
-  assert( entityB != NULL);
-  this->collisionList.push_back(c);
-  c->collide(entityA, entityB);
+  assert( c->getEntityA() != NULL);
+  assert( c->getEntityB() != NULL);
 
   // now register it as a shared collision with the other collision entity
@@ -190 +191 @@
   for(; it < this->collisionList.end(); it++) {
     this->collisionReaction->reactToCollision(*it);
+    (*it)->flushCollisionEvents();
   }
 

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

@@ -54 +54 @@
   float damage;
 
+  assert(collision->getEntityA() != NULL);
+  assert(collision->getEntityB() != NULL);
+
   PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),