Changeset 6710 for code

Timestamp:

Apr 13, 2010, 9:50:11 AM (15 years ago)

Author:

dafrick

Message:

Merged ppspickups2 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/includes/pickups_invisible.oxi (copied) (copied from code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi)
• data/levels/pickup_pps_invi.oxw (copied) (copied from code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw)
• data/levels/templates/pickup_representation_templates_invisible.oxt (copied) (copied from code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/InvisiblePickup.cc (copied) (copied from code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc)
• src/modules/pickup/items/InvisiblePickup.h (copied) (copied from code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h)
• src/orxonox/interfaces/PickupCarrier.h (modified) (2 diffs)

code/trunk/src/modules/pickup/PickupPrereqs.h

@@ -76 +76 @@
     //items
     class HealthPickup;
+    class InvisiblePickup;
     class MetaPickup;
     class SpeedPickup;

code/trunk/src/modules/pickup/items/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(PICKUP_SRC_FILES
-
   HealthPickup.cc
-
+  InvisiblePickup.cc
+  MetaPickup.cc
   SpeedPickup.cc
-  MetaPickup.cc
-
 )

code/trunk/src/orxonox/interfaces/PickupCarrier.h

@@ -47 +47 @@
 namespace orxonox
 {
-    class Pickupable;
+
+    //! Forward-declarations.
     class Pickup;
     class HealthPickup;
+    class InvisiblePickup;
     class MetaPickup;
     class SpeedPickup;
@@ -66 +68 @@
         friend class Pickup;
         friend class HealthPickup;
+        friend class InvisiblePickup;
         friend class MetaPickup;
         friend class SpeedPickup;