Changeset 6710 for code/trunk/src/orxonox

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)
• src/orxonox/interfaces/PickupCarrier.h (modified) (2 diffs)

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;