Changeset 8577 for code/branches/gameimmersion/src/orxonox/weaponsystem

Timestamp:

May 25, 2011, 9:07:17 PM (14 years ago)

Author:

dafrick

Message:

Cleanup. Adding shield and boost shaking to Assff.

Location:

code/branches/gameimmersion/src/orxonox/weaponsystem

Files:

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

code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.cc

@@ -66 +66 @@
 
         this->damage_ = 0;
-///////////////////me
         this->healthdamage_ = 0;
         this->shielddamage_ = 0;
-///////////////////end me
+
         this->muzzleOffset_ = Vector3::ZERO;
         this->muzzlePosition_ = Vector3::ZERO;
@@ -109 +108 @@
 
         XMLPortParam(WeaponMode, "damage",           setDamage,           getDamage,           xmlelement, mode);
-//////////me
         XMLPortParam(WeaponMode, "healthdamage",     setHealthDamage,     getHealthDamage,     xmlelement, mode);
         XMLPortParam(WeaponMode, "shielddamage",     setShieldDamage,     getShieldDamage,     xmlelement, mode);
-/////////end me
         XMLPortParam(WeaponMode, "muzzleoffset",     setMuzzleOffset,     getMuzzleOffset,     xmlelement, mode);
     }

code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h

@@ -107 +107 @@
             inline float getDamage() const
                 { return this->damage_; }
-////////////////////me, copied to projectile.cc
-
             inline void setHealthDamage(float healthdamage)
                 { this->healthdamage_ = healthdamage; }
@@ -119 +117 @@
                 { return this->shielddamage_; }
 
-///////////////////end me
             inline void setMuzzleOffset(const Vector3& offset)
                 { this->muzzleOffset_ = offset; }