Changeset 9667 for code/trunk/src/orxonox/controllers/FormationController.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/FormationController.cc (modified) (2 diffs)

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

@@ -56 +56 @@
     SetConsoleCommand("FormationController", "formationsize",    &FormationController::formationsize);
 
-
-
+    RegisterClass(FormationController);
 
     static const unsigned int STANDARD_MAX_FORMATION_SIZE = 9;
@@ -69 +68 @@
     static const float ROTATEFACTOR_FREE = 0.8f;
 
-    FormationController::FormationController(BaseObject* creator) : Controller(creator)
+    FormationController::FormationController(Context* context) : Controller(context)
     {
         RegisterObject(FormationController);