Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7096 for code


Ignore:
Timestamp:
Jun 2, 2010, 11:30:11 PM (14 years ago)
Author:
dafrick
Message:

Some more attempts regarding pickups.
Also removed and reodered pickups in presentation level.

Location:
code/branches/presentation3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation3/data/levels/presentationFS10.oxw

    r7046 r7096  
    5050    <!-- Health pickups -->
    5151
    52     <PickupSpawner position="0,-50,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
     52    <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    5353      <pickup>
    5454        <HealthPickup template=hugehealthpickup />
    … …  
    5858    <!-- Speed pickups -->
    5959
    60     <PickupSpawner position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
     60    <PickupSpawner position="25,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    6161      <pickup>
    6262        <SpeedPickup template=hugespeedpickup />
    … …  
    6464    </PickupSpawner>
    6565
    66     <PickupSpawner position="50,-75,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
     66    <PickupSpawner position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    6767      <pickup>
    6868        <SpeedPickup template=smalljumppickup />
    … …  
    7272    <!-- Invisible pickups -->
    7373
    74     <PickupSpawner position="25,-75,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
     74    <PickupSpawner position="0,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    7575      <pickup>
    7676        <InvisiblePickup template=hugeinvisiblepickup />
    77       </pickup>
    78     </PickupSpawner>
    79 
    80     <!-- Pickup Collection pickups -->
    81 
    82     <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    83       <pickup>
    84         <PickupCollection template=triplehealthspeedinvisibilitypickup />
    8577      </pickup>
    8678    </PickupSpawner>
    … …  
    9890    </PickupRepresentation>
    9991
    100     <PickupSpawner position="25,-50,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
     92    <PickupSpawner position="25,-75,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    10193      <pickup>
    10294        <HealthPickup health=50 activationType=onUse durationType=once />

  • code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc

    r6711 r7096  
    6868        while(it != this->pickups_.end())
    6969        {
    70             (*(it++))->destroy();
     70            (*it)->destroy();
     71            it = this->pickups_.begin();
    7172        }
    7273
Note: See TracChangeset for help on using the changeset viewer.