Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6700 in orxonox.OLD for trunk/src/world_entities/weapons


Ignore:
Timestamp:
Jan 25, 2006, 3:10:17 PM (19 years ago)
Author:
bensch
Message:

trunk: Energy→Health

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/weapon.cc

    r6695 r6700  
    150150    Projectile* pj = dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
    151151    this->minCharge = pj->getMinEnergy();
    152     this->maxCharge = pj->getMaxEnergy();
     152    this->maxCharge = pj->getHealthMax();
    153153    this->chargeable = pj->isChageable();
    154154    this->projectileFactory->kill(pj);
Note: See TracChangeset for help on using the changeset viewer.