[Orxonox-commit 2381] r7096 - in code/branches/presentation3: data/levels src/orxonox/interfaces

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-06-02 23:30:11 +0200 (Wed, 02 Jun 2010)
New Revision: 7096

Modified:
   code/branches/presentation3/data/levels/presentationFS10.oxw
   code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc
Log:
Some more attempts regarding pickups.
Also removed and reodered pickups in presentation level.


Modified: code/branches/presentation3/data/levels/presentationFS10.oxw
===================================================================
--- code/branches/presentation3/data/levels/presentationFS10.oxw	2010-06-02 21:18:00 UTC (rev 7095)
+++ code/branches/presentation3/data/levels/presentationFS10.oxw	2010-06-02 21:30:11 UTC (rev 7096)
@@ -49,7 +49,7 @@
 
     <!-- Health pickups -->
 
-    <PickupSpawner position="0,-50,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+    <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
       <pickup>
         <HealthPickup template=hugehealthpickup />
       </pickup>
@@ -57,13 +57,13 @@
 
     <!-- Speed pickups -->
 
-    <PickupSpawner position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
+    <PickupSpawner position="25,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
       <pickup>
         <SpeedPickup template=hugespeedpickup />
       </pickup>
     </PickupSpawner>
 
-    <PickupSpawner position="50,-75,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
+    <PickupSpawner position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
       <pickup>
         <SpeedPickup template=smalljumppickup />
       </pickup>
@@ -71,20 +71,12 @@
 
     <!-- Invisible pickups -->
 
-    <PickupSpawner position="25,-75,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
+    <PickupSpawner position="0,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
       <pickup>
         <InvisiblePickup template=hugeinvisiblepickup />
       </pickup>
     </PickupSpawner>
 
-    <!-- Pickup Collection pickups -->
-
-    <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-      <pickup>
-        <PickupCollection template=triplehealthspeedinvisibilitypickup />
-      </pickup>
-    </PickupSpawner>
-
     <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
     <PickupRepresentation
       pickupName = "Medium Health Pack"
@@ -97,7 +89,7 @@
       </pickup>
     </PickupRepresentation>
 
-    <PickupSpawner position="25,-50,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <PickupSpawner position="25,-75,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
         <HealthPickup health=50 activationType=onUse durationType=once />
       </pickup>

Modified: code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc	2010-06-02 21:18:00 UTC (rev 7095)
+++ code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc	2010-06-02 21:30:11 UTC (rev 7096)
@@ -67,7 +67,8 @@
         std::set<Pickupable*>::iterator it = this->pickups_.begin();
         while(it != this->pickups_.end())
         {
-            (*(it++))->destroy();
+            (*it)->destroy();
+            it = this->pickups_.begin();
         }
 
         this->pickups_.clear();