Changeset 9667 for code/trunk/src/modules/pickup/CollectiblePickup.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/pickup/CollectiblePickup.cc (modified) (1 diff)

code/trunk/src/modules/pickup/CollectiblePickup.cc

@@ -38 +38 @@
 #include "PickupCollection.h"
 
-namespace orxonox {
+namespace orxonox
+{
+    RegisterAbstractClass(CollectiblePickup).inheritsFrom(Class(Pickupable));
 
     /**