Changeset 8169 in orxonox.OLD for branches/cr

Timestamp:

Jun 6, 2006, 2:05:33 AM (19 years ago)

Author:

patrick

Message:

cr: using a new damage structure for dealing damage. working

Location:

branches/cr/src

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (2 diffs)
• world_entities/projectiles/projectile.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (2 diffs)

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

@@ -60 +60 @@
   // the collision damage been dealed by the entity
   if( collision->isEntityACollide()) {
-    damage = collision->getEntityB()->getHealthMax();
+    damage = collision->getEntityB()->getDamage();
     collision->getEntityA()->decreaseHealth(damage);
   }
@@ -66 +66 @@
 
   if( collision->isEntityBCollide()) {
-    damage = collision->getEntityA()->getHealthMax();
+    damage = collision->getEntityA()->getDamage();
     collision->getEntityB()->decreaseHealth(damage);
   }

branches/cr/src/world_entities/projectiles/projectile.cc

@@ -38 +38 @@
   this->target = NULL;
   this->removeNode();
+
+  /* character attributes */
+  this->setHealth(1.0f);
+  this->setDamage(100.0f); // default damage of a projectile set to 100.0 damage points
 
   this->explosionBuffer = NULL;

branches/cr/src/world_entities/world_entity.cc

@@ -61 +61 @@
   this->healthMax = 1.0f;
   this->health = 1.0f;
+  this->damage = 0.0f; // no damage dealt by a default entity
   this->scaling = 1.0f;
 

branches/cr/src/world_entities/world_entity.h

@@ -106 +106 @@
 
   /* --- Character Attribute Block --- */
+  /** @returns the damage dealt by this world entity */
+  float getDamage() const { return this->damage; }
+  /** sets the damage dealt to @param damage damage per second */
+  void setDamage(float damage) { this->damage = damage; }
   /** @returns the Energy of the entity */
   float getHealth() const { return this->health; };
@@ -142 +146 @@
 private:
   /// TODO maybe we will move the following three entries and the corresponding functions to Playable AND NPC
+  float                   damage;             //!< the damage dealt to other objects by colliding.
   float                   health;             //!< The Energy of this Entity, if the Entity has any energy at all.
   float                   healthMax;          //!< The Maximal energy this entity can take.