Changeset 10708 in orxonox.OLD for branches/presentation/src/world_entities/world_entity.cc

Timestamp:

Jun 16, 2007, 11:15:39 AM (17 years ago)

Author:

rennerc

Message:

improved damage handling for adm

File:

• branches/presentation/src/world_entities/world_entity.cc (modified) (4 diffs)

branches/presentation/src/world_entities/world_entity.cc

@@ -97 +97 @@
   this->entityTrack = NULL;
   this->bDrawTrack = false;
+  
+  this->forwardDamageToParent = false;
 
   // registering default reactions:
@@ -179 +181 @@
   LoadParam(root, "drawTrack", this, WorldEntity, drawDebugTrack)
       .describe("draws the track for debugging purposes");
+  
+  LoadParam(root, "forwardDamageToParent", this, WorldEntity, setForwardDamageToParent);
 
   // Track
@@ -980 +984 @@
 void WorldEntity::hit(float damage, WorldEntity* killer)
 {
-
+  PRINTF(0)("TESTS: %i %i %i\n", (forwardDamageToParent), (this->getParent() != NullParent::getNullParent()), (this->getParent()->isA( WorldEntity::staticClassID() )));
+  if ( forwardDamageToParent && this->getParent() != NullParent::getNullParent() && this->getParent()->isA( WorldEntity::staticClassID() ) )
+  {
+    WorldEntity* pa = dynamic_cast<WorldEntity*>(this->getParent());
+    pa->hit( damage, killer );
+    return;
+  }
+  
+  bool dead = this->getHealth()<=0;
+  
   this->decreaseHealth(damage);
 
@@ -991 +1004 @@
   else
   {
-    this->destroy( killer );
+    if ( !dead )
+      this->destroy( killer );
   }
 }