Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8547


Ignore:
Timestamp:
May 23, 2011, 5:16:00 PM (13 years ago)
Author:
simonmie
Message:

added set/get shield/health-damage functionality to RocketFire and SimpleRocketFire, made comments

Location:
code/branches/gameimmersion/src/modules/weapons/weaponmodes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc

    r8542 r8547  
    7373        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    7474        rocket->setDamage(this->getDamage());
    75 //        rocket->setShieldDamage(this->getShieldDamage()); //correct this!
    76 //        rocket->setHealthDamage(this->getHealthDamage());
     75        rocket->setShieldDamage(this->getShieldDamage());
     76        rocket->setHealthDamage(this->getHealthDamage());
    7777    }
    7878}
  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

    r8492 r8547  
    2323 *      Oliver Scheuss
    2424 *   Co-authors:
    25  *      ...
     25 *      simonmie
    2626 *
    2727 */
     
    6262    }
    6363
     64    /* Creates the Rocket (RocketController) object, sets its properties to the SimpleRocketFire properties, sets target
     65     */
    6466    void SimpleRocketFire::fire()
    6567    {
     
    7375
    7476        rocket->setDamage(this->damage_);
    75 //        rocket->setShieldDamage(this->getShieldDamage());
    76 //        rocket->setHealthDamage(this->getHealthDamage());
     77        rocket->setShieldDamage(this->getShieldDamage());
     78        rocket->setHealthDamage(this->getHealthDamage());
    7779
    7880        WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
Note: See TracChangeset for help on using the changeset viewer.