Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8502 for code/branches/pickup


Ignore:
Timestamp:
May 18, 2011, 12:36:59 PM (14 years ago)
Author:
dafrick
Message:

Minor changes.

Location:
code/branches/pickup
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r8255 r8502  
    184184    </PickupRepresentation>
    185185
    186     <!--PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
     186    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    187187      <pickup>
    188188        <HealthPickup health=500 activationType=immediate healthRate=10 durationType=continuous />
    189189      </pickup>
    190     </PickupSpawner-->
     190    </PickupSpawner>
    191191
    192192    <PickupSpawner position="-30,-30,-30" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">

  • code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc

    r8489 r8502  
    2121 *
    2222 *   Author:
    23  *      Damian 'Mozork' Frick
     23 *      Sandro Sgier
    2424 *   Co-authors:
    2525 *      ...
    … …  
    9797            durationTimer.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));
    9898        }
    99         else
    100         {
    101             this->Pickupable::destroy();
    102         }
    10399    }
    104100
    … …  
    144140        }
    145141        else if(isTerminating_ == true)
    146         setUsed(false);
     142            this->Pickupable::destroy();
     143
    147144    }
    148145
    … …  
    151148        isActive_ = false;
    152149        isTerminating_ = true;
     150        setUsed(false);
    153151    }
    154152

  • code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h

    r8489 r8502  
    2121 *
    2222 *   Author:
    23  *      Damian 'Mozork' Frick
     23 *      Sandro Sgier
    2424 *   Co-authors:
    2525 *      ...
Note: See TracChangeset for help on using the changeset viewer.