Changeset 9667 for code/trunk/src/libraries/tools/ResourceCollection.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/libraries/tools/ResourceCollection.cc (modified) (1 diff)

code/trunk/src/libraries/tools/ResourceCollection.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateFactory(ResourceCollection);
+    RegisterClass(ResourceCollection);
 
-    ResourceCollection::ResourceCollection(BaseObject* creator)
-        : BaseObject(creator)
+    ResourceCollection::ResourceCollection(Context* context)
+        : BaseObject(context)
     {
         RegisterObject(ResourceCollection);