Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 2, 2011, 5:17:20 PM (14 years ago)
Author:
simonmie
Message:

New shielddamage implemented, depending functions changed, bugs fixed.

LightningGun →fire changed
Other weapons still need to be edited

Location:
code/branches/gameimmersion/src/orxonox/weaponsystem
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.cc

    r7847 r8386  
    6666
    6767        this->damage_ = 0;
    68 
     68///////////////////me
     69        this->healthdamage_ = 0;
     70        this->shielddamage_ = 0;
     71///////////////////end me
    6972        this->muzzleOffset_ = Vector3::ZERO;
    7073        this->muzzlePosition_ = Vector3::ZERO;
     
    106109
    107110        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
    108115        XMLPortParam(WeaponMode, "muzzleoffset",     setMuzzleOffset,     getMuzzleOffset,     xmlelement, mode);
    109116    }
  • code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h

    r7163 r8386  
    104104            // Fire
    105105            inline void setDamage(float damage)
    106                 { this->damage_ = damage; }
     106                { this->damage_ = damage; COUT(3) << "DAMAGE-SET-FUNKTION (WeaponMode) WIRD AUFGERUFEN" << endl;}
    107107            inline float getDamage() const
    108108                { return this->damage_; }
     109////////////////////me, copied to projectile.cc
    109110
     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
    110122            inline void setMuzzleOffset(const Vector3& offset)
    111123                { this->muzzleOffset_ = offset; }
     
    146158
    147159            float damage_;
     160            float healthdamage_;
     161            float shielddamage_;
    148162            Vector3 muzzleOffset_;
    149163
Note: See TracChangeset for help on using the changeset viewer.