Changeset 8578 for code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc

Timestamp:

May 25, 2011, 9:22:53 PM (13 years ago)

Author:

dafrick

Message:

Merging game immersion branch into presentation branch.

File:

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

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

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