Changeset 6419 for code/branches/pickup3/src/orxonox/OrxonoxPrereqs.h

Timestamp:

Dec 25, 2009, 11:07:09 PM (14 years ago)

Author:

rgrieder

Message:

Merged pickup2 into pickup3.

Location:

code/branches/pickup3

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (2 diffs)

code/branches/pickup3/src/orxonox/OrxonoxPrereqs.h

@@ -117 +117 @@
     class GametypeMessageListener;
     class NotificationListener;
+    class Pickupable;
+    class PickupCarrier;
     class PlayerTrigger;
     class RadarListener;
@@ -133 +135 @@
     class OrxonoxOverlay;
     class OverlayGroup;
-
-    // pickup
-    class BaseItem;
-    class DroppedItem;
-    class EquipmentItem;
-    class ModifierPickup;
-    class PassiveItem;
-    class PickupCollection;
-    class PickupInventory;
-    class PickupSpawner;
-    class UsableItem;
-    // pickup, items
-    class HealthImmediate;
-    class HealthUsable;
-    class Jump;
 
     //sound