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

Timestamp:

May 23, 2011, 3:54:40 PM (13 years ago)

Author:

simonmie

Message:

comments added, unused parts removed, some spam messages removed

File:

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

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
@@ -51 +51 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
-/*            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
-
-            inline void setHealthDamage(float healthdamage)
-                { this->healthdamage_ = healthdamage; }
-            inline float getHealthDamage() const
-                { return this->healthdamage_; }
-
-            inline void setShieldDamage(float shielddamage)
-                { this->shielddamage_ = shielddamage; COUT(3) << "SHIELDDAMAGE SET TO " << shielddamage << endl; } //ShieldDamage wird korrekt gesettet vom XML-File
-            inline float getShieldDamage() const
-                { return this->shielddamage_; }
-
-///////////////////end me
-*/
 
         private:
             WeakPtr<Pawn> owner_;
             float lifetime_;
-/*            float damage_;
-///////me
-            float healthdamage_;
-            float shielddamage_;
-///////end me
-            bool bDestroy_;
-*/            Timer destroyTimer_;
+            Timer destroyTimer_;
     };
 }