Changeset 8110 in orxonox.OLD

Timestamp:

Jun 2, 2006, 12:53:16 AM (18 years ago)

Author:

patrick

Message:

cr: collision reaction: deal damage done

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (3 diffs)
• cr_object_damage.cc (modified) (1 diff)

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

@@ -93 +93 @@
     c = this->collisionList.back();
 
-  c->collide(entityA, entityB);
-  c->setEntityACollide(true);
   this->collisionList.push_back(c);
 
@@ -118 +116 @@
   // set the state to not dispatched
   this->bDispatched = false;
+  collision->setEntityBCollide(true);
 
   this->collisionList.push_back(collision);
@@ -137 +136 @@
   // first element only
  Collision* c = this->registerCollision(collisionEvent->getEntityA(), collisionEvent->getEntityB());
+ c->setEntityACollide(true);
+
  c->registerCollisionEvent(collisionEvent);
-
 }
 

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

@@ -52 +52 @@
 void CRObjectDamage::reactToCollision(Collision* collision)
 {
+  float damage;
 
-//   if(collision->)
+  // the collision damage been dealed by the entity
+  if( collision->isEntityACollide()) {
+    damage = collision->getEntityB()->getHealthMax();
+    collision->getEntityA()->decreaseHealth(damage);
+  }
+  if( collision->isEntityBCollide()) {
+    damage = collision->getEntityA()->getHealthMax();
+    collision->getEntityB()->decreaseHealth(damage);
+  }
 
 //   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());