Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6520


Ignore:
Timestamp:
Mar 14, 2010, 10:27:41 AM (14 years ago)
Author:
dafrick
Message:

Small fix in HealthPickup.

Location:
code/branches/pickup3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pickup3/data/levels/pickup.oxw

    r6519 r6520  
    3737    <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    3838        <pickup>
    39             <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
     39            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=permanent />
    4040        </pickup>
    4141    </PickupSpawner>

  • code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc

    r6499 r6520  
    150150            {
    151151                case pickupHealthType::permanent:
    152                     if(pawn->getMaxHealth() > fullHealth)
     152                    if(pawn->getMaxHealth() < fullHealth)
    153153                        pawn->setMaxHealth(fullHealth);
    154154                case pickupHealthType::limited:
Note: See TracChangeset for help on using the changeset viewer.