[Orxonox-commit 3569] r8255 - in code/branches/pickup: data/levels src/modules/pickup src/modules/pickup/items

[ssgier at orxonox.net]

Author: ssgier
Date: 2011-04-18 16:08:46 +0200 (Mon, 18 Apr 2011)
New Revision: 8255

Modified:
   code/branches/pickup/data/levels/pickups.oxw
   code/branches/pickup/src/modules/pickup/PickupPrereqs.h
   code/branches/pickup/src/modules/pickup/items/CMakeLists.txt
Log:
No Comment

Modified: code/branches/pickup/data/levels/pickups.oxw
===================================================================
--- code/branches/pickup/data/levels/pickups.oxw	2011-04-18 14:04:40 UTC (rev 8254)
+++ code/branches/pickup/data/levels/pickups.oxw	2011-04-18 14:08:46 UTC (rev 8255)
@@ -183,10 +183,16 @@
       </pickup>
     </PickupRepresentation>
 
-    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <!--PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
         <HealthPickup health=500 activationType=immediate healthRate=10 durationType=continuous />
       </pickup>
+    </PickupSpawner-->
+
+    <PickupSpawner position="-30,-30,-30" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+      <pickup>
+        <ShrinkPickup />
+      </pickup>
     </PickupSpawner>
 
   </Scene>

Modified: code/branches/pickup/src/modules/pickup/PickupPrereqs.h
===================================================================
--- code/branches/pickup/src/modules/pickup/PickupPrereqs.h	2011-04-18 14:04:40 UTC (rev 8254)
+++ code/branches/pickup/src/modules/pickup/PickupPrereqs.h	2011-04-18 14:08:46 UTC (rev 8255)
@@ -81,6 +81,7 @@
     class MetaPickup;
     class SpeedPickup;
     class ShieldPickup;
+	class ShrinkPickup;
 
 }
 

Modified: code/branches/pickup/src/modules/pickup/items/CMakeLists.txt
===================================================================
--- code/branches/pickup/src/modules/pickup/items/CMakeLists.txt	2011-04-18 14:04:40 UTC (rev 8254)
+++ code/branches/pickup/src/modules/pickup/items/CMakeLists.txt	2011-04-18 14:08:46 UTC (rev 8255)
@@ -5,4 +5,5 @@
   DronePickup.cc
   SpeedPickup.cc
   ShieldPickup.cc
+  ShrinkPickup.cc
 )