Changeset 8579 for code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h

Timestamp:

May 25, 2011, 9:28:29 PM (14 years ago)

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:

• code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) (2 diffs)

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

@@ -104 +104 @@
             // Fire
             inline void setDamage(float damage)
-                { this->damage_ = damage;}
+                { this->damage_ = damage; }
             inline float getDamage() const
                 { return this->damage_; }
-            inline void setHealthDamage(float healthdamage)
-                { this->healthdamage_ = healthdamage; }
-            inline float getHealthDamage() const
-                { return this->healthdamage_; }
-
-            inline void setShieldDamage(float shielddamage)
-                { this->shielddamage_ = shielddamage;}
-            inline float getShieldDamage() const
-                { return this->shielddamage_; }
 
             inline void setMuzzleOffset(const Vector3& offset)
@@ -155 +146 @@
 
             float damage_;
-            float healthdamage_;
-            float shielddamage_;
             Vector3 muzzleOffset_;