Changeset 9244 for code/branches/presentation2012

Timestamp:

May 24, 2012, 10:01:01 PM (12 years ago)

Author:

landauf

Message:

reverted the rest of r9241

Location:

code/branches/presentation2012

Files:

• . (modified) (1 prop)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• src/modules/gametypes/CaptureTheFlag.cc (deleted)
• src/modules/gametypes/CaptureTheFlag.h (deleted)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/FlagPickup.cc (deleted)
• src/modules/pickup/items/FlagPickup.h (deleted)

code/branches/presentation2012/data/levels/emptyLevel.oxw

@@ -15 +15 @@
   include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
-    include("templates/pickupRepresentationTemplates.oxt")
 ?>
 
@@ -30 +29 @@
   >
 
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />

code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h

@@ -68 +68 @@
 namespace orxonox
 {
+
     class CollectiblePickup;
     class DroppedPickup;