Changeset 9960 in orxonox.OLD

Timestamp:

Nov 26, 2006, 1:29:09 PM (17 years ago)

Author:

nicolasc

Message:

fixed get*Damage() return values

Location:

branches/playability/src/world_entities/projectiles

Files:

• projectile.cc (modified) (2 diffs)
• projectile.h (modified) (2 diffs)

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

@@ -44 +44 @@
   this->setDamage(1.0f); // default damage of a projectile set to 100.0 damage points
 
+  this->physDamage = 0.0f;
+  this->elecDamage = 0.0f;
   //this->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
 }
@@ -58 +60 @@
   */
   //delete this->projectileModel;
+}
+
+Projectile::Projectile (float pDamage, float eDamage, PNode* target) : WorldEntity()
+{
+  this->registerObject(this, Projectile::_objectList);
+
+  this->lifeCycle = 0.0;
+  this->lifeSpan = 1.0f; /* sec */
+  this->removeNode();
+
+  /* character attributes */
+  this->setHealth(1.0f);
+  this->setDamage(1.0f); // default damage of a projectile set to 100.0 damage points
+
+  this->physDamage = pDamage;
+  this->elecDamage = eDamage;
+  this->target = target;
+
+  //this->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+}
+
+void Projectile::initialize(float pDamage, float eDamage, PNode* target)
+{
+  /* character attributes*/
+  this->physDamage = pDamage;
+  this->elecDamage = eDamage;
+  this->target = target;
 }
 

branches/playability/src/world_entities/projectiles/projectile.h

@@ -23 +23 @@
     Projectile ();
     virtual ~Projectile ();
+
+    /** @brief Constructor with variable passing*/
+    Projectile (float pDamage, float eDamage, PNode* target);
+    /** @brief for void construction; setting values later - needed for FastFactory*/
+    virtual void initialize(float pDamage, float eDamage, PNode* target);
 
     void setFlightDirection(const Quaternion& flightDirection);
@@ -54 +59 @@
     inline bool tickLifeCycle(float dt ) { this->lifeCycle += dt/this->lifeSpan;  return(unlikely(this->lifeCycle >= 1)); }
 
-    inline int getPhysDamage() { return this->physDamage; };
-    inline int getElecDamage() { return this->elecDamage; };
+    inline float getPhysDamage() { return this->physDamage; };
+    inline float getElecDamage() { return this->elecDamage; };
 
   protected: