Changeset 6520 for code/branches/pickup3
- Timestamp:
- Mar 14, 2010, 10:27:41 AM (15 years ago)
- Location:
- code/branches/pickup3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup3/data/levels/pickup.oxw
r6519 r6520 37 37 <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10"> 38 38 <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 /> 40 40 </pickup> 41 41 </PickupSpawner> -
code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
r6499 r6520 150 150 { 151 151 case pickupHealthType::permanent: 152 if(pawn->getMaxHealth() >fullHealth)152 if(pawn->getMaxHealth() < fullHealth) 153 153 pawn->setMaxHealth(fullHealth); 154 154 case pickupHealthType::limited:
Note: See TracChangeset
for help on using the changeset viewer.