Changeset 9960 in orxonox.OLD for branches/playability/src/world_entities/projectiles/projectile.h

Timestamp:

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

Author:

nicolasc

Message:

fixed get*Damage() return values

File:

• branches/playability/src/world_entities/projectiles/projectile.h (modified) (2 diffs)

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: