Changeset 9958 in orxonox.OLD for branches/playability/src/world_entities/projectiles

Timestamp:

Nov 26, 2006, 12:31:01 AM (18 years ago)

Author:

marcscha

Message:

Inline of damage get on projectile, part implementation of primary - secondary weapon and handling variables for the weapon manager

Location:

branches/playability/src/world_entities/projectiles

Files:

• projectile.cc (modified) (1 diff)
• projectile.h (modified) (1 diff)

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

@@ -152 +152 @@
     this->soundSource.play(this->explosionBuffer);
 }
-
-int Projectile::getPhysDamage () { return this->physDamage; }
-
-int Projectile::getElecDamage () { return this->elecDamage; }

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

@@ -52 +52 @@
     inline bool tickLifeCycle(float dt ) { this->lifeCycle += dt/this->lifeSpan;  return(unlikely(this->lifeCycle >= 1)); }
 
-    virtual int getPhysDamage();
-    virtual int getElecDamage();
+    inline int getPhysDamage() { return this->physDamage; };
+    inline int getElecDamage() { return this->elecDamage; };
 
   protected: