Changeset 8386 for code/branches/gameimmersion/src/orxonox/weaponsystem
- Timestamp:
- May 2, 2011, 5:17:20 PM (14 years ago)
- Location:
- code/branches/gameimmersion/src/orxonox/weaponsystem
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.cc
r7847 r8386 66 66 67 67 this->damage_ = 0; 68 68 ///////////////////me 69 this->healthdamage_ = 0; 70 this->shielddamage_ = 0; 71 ///////////////////end me 69 72 this->muzzleOffset_ = Vector3::ZERO; 70 73 this->muzzlePosition_ = Vector3::ZERO; … … 106 109 107 110 XMLPortParam(WeaponMode, "damage", setDamage, getDamage, xmlelement, mode); 111 //////////me 112 XMLPortParam(WeaponMode, "healthdamage", setHealthDamage, getHealthDamage, xmlelement, mode); 113 XMLPortParam(WeaponMode, "shielddamage", setShieldDamage, getShieldDamage, xmlelement, mode); 114 /////////end me 108 115 XMLPortParam(WeaponMode, "muzzleoffset", setMuzzleOffset, getMuzzleOffset, xmlelement, mode); 109 116 } -
code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h
r7163 r8386 104 104 // Fire 105 105 inline void setDamage(float damage) 106 { this->damage_ = damage; }106 { this->damage_ = damage; COUT(3) << "DAMAGE-SET-FUNKTION (WeaponMode) WIRD AUFGERUFEN" << endl;} 107 107 inline float getDamage() const 108 108 { return this->damage_; } 109 ////////////////////me, copied to projectile.cc 109 110 111 inline void setHealthDamage(float healthdamage) 112 { this->healthdamage_ = healthdamage; } 113 inline float getHealthDamage() const 114 { return this->healthdamage_; } 115 116 inline void setShieldDamage(float shielddamage) 117 { this->shielddamage_ = shielddamage;} //ShieldDamage wird korrekt gesettet vom XML-File 118 inline float getShieldDamage() const 119 { return this->shielddamage_; } 120 121 ///////////////////end me 110 122 inline void setMuzzleOffset(const Vector3& offset) 111 123 { this->muzzleOffset_ = offset; } … … 146 158 147 159 float damage_; 160 float healthdamage_; 161 float shielddamage_; 148 162 Vector3 muzzleOffset_; 149 163
Note: See TracChangeset
for help on using the changeset viewer.