Changeset 9667 for code/trunk/src/orxonox/controllers/WaypointController.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/orxonox/controllers/WaypointController.cc (modified) (1 diff)

code/trunk/src/orxonox/controllers/WaypointController.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(WaypointController);
+    RegisterClass(WaypointController);
 
-    WaypointController::WaypointController(BaseObject* creator) : ArtificialController(creator)
+    WaypointController::WaypointController(Context* context) : ArtificialController(context)
     {
         RegisterObject(WaypointController);