[Orxonox-commit 4545] r9217 - in code/branches/captureTheFlag: data/levels/includes src/modules/gametypes

[ninow at orxonox.net]

Author: ninow
Date: 2012-05-18 16:39:32 +0200 (Fri, 18 May 2012)
New Revision: 9217

Modified:
   code/branches/captureTheFlag/data/levels/includes/pickups.oxi
   code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt
Log:
First Checkin of my Gametype

Modified: code/branches/captureTheFlag/data/levels/includes/pickups.oxi
===================================================================
--- code/branches/captureTheFlag/data/levels/includes/pickups.oxi	2012-05-18 14:32:28 UTC (rev 9216)
+++ code/branches/captureTheFlag/data/levels/includes/pickups.oxi	2012-05-18 14:39:32 UTC (rev 9217)
@@ -244,3 +244,27 @@
     </pickup>
 </PickupRepresentation>
 
+<!--TODO: add Templates-->
+<PickupRepresentation
+    pickupName = "Blue Flag"
+    pickupDescription = "Flag of blue Team"
+    spawnerTemplate = "hugeshrinkpickupRepresentation"
+    inventoryRepresentation = "HugeShrink"
+>
+    <pickup>
+        <FlagPickup template=smallshieldpickup />
+    </pickup>
+</PickupRepresentation>
+
+<!--TODO: add Templates-->
+<PickupRepresentation
+    pickupName = "Red Flag"
+    pickupDescription = "Flag of red Team"
+    spawnerTemplate = "hugeshrinkpickupRepresentation"
+    inventoryRepresentation = "HugeShrink"
+>
+    <pickup>
+        <FlagPickup template=smallshieldpickup />
+    </pickup>
+</PickupRepresentation>
+

Modified: code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt
===================================================================
--- code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt	2012-05-18 14:32:28 UTC (rev 9216)
+++ code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt	2012-05-18 14:39:32 UTC (rev 9217)
@@ -4,6 +4,7 @@
   SpaceRaceManager.cc
   OldSpaceRace.cc
   OldRaceCheckPoint.cc
+  captureTheFlag.cc
 )
 
 ORXONOX_ADD_LIBRARY(gametypes