Changeset 8492 for code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h

Timestamp:

May 16, 2011, 5:25:00 PM (14 years ago)

Author:

simonmie

Message:

New Shield effect added (from tibork), first working BasicProjectile class, changes in weapon classes to fit new BasicProjectile system, some spam messages in Pawn.cc removed

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h (modified) (4 diffs)

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h

@@ -35 +35 @@
 #include "worldentities/MovableEntity.h"
 
+#include "BasicProjectile.h"
+
 namespace orxonox
 {
-    class _WeaponsExport Projectile : public MovableEntity
+    class _WeaponsExport Projectile : public MovableEntity, public BasicProjectile
     {
         public:
@@ -49 +51 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
-            inline void setDamage(float damage)
+/*            inline void setDamage(float damage)
                 { this->damage_ = damage;  COUT(3) << "DAMAGE-SET-FUNKTION WIRD AUFGERUFEN" << endl; }
             inline float getDamage() const
                 { return this->damage_; }
-
+*/
             void setOwner(Pawn* owner);
             inline Pawn* getOwner() const
                 { return this->owner_; }
 
-////////////////////me
+/*///////////////////me
 
             inline void setHealthDamage(float healthdamage)
@@ -71 +73 @@
 
 ///////////////////end me
-
+*/
 
         private:
             WeakPtr<Pawn> owner_;
             float lifetime_;
-            float damage_;
+/*            float damage_;
 ///////me
             float healthdamage_;
@@ -82 +84 @@
 ///////end me
             bool bDestroy_;
-            Timer destroyTimer_;
+*/            Timer destroyTimer_;
     };
 }