Changeset 9679 for code/branches/tutorial4

Timestamp:

Sep 30, 2013, 9:54:58 AM (11 years ago)

Author:

jo

Message:

Updates due to core6 changes.

Location:

code/branches/tutorial4/src/orxonox

Files:

• controllers/AutonomousDroneController.cc (modified) (1 diff)
• controllers/AutonomousDroneController.h (modified) (1 diff)
• worldentities/AutonomousDrone.cc (modified) (1 diff)
• worldentities/AutonomousDrone.h (modified) (1 diff)

code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc

@@ -38 +38 @@
     @brief
         Constructor.
-    @param creator
-        The creator of this object.
+    @param context
+        The context of this object.
     */
-    AutonomousDroneController::AutonomousDroneController(BaseObject* creator) : Controller(creator)
+    AutonomousDroneController::AutonomousDroneController(Context* context) : Controller(context)
     {
         //TODO: Place your code here:
         // Make sure to register the object and create the factory.
 
-        // This checks that our creator really is a drone
+        // This checks that our context really is a drone
         // and saves the pointer to the drone for the controlling commands
-        AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(creator);
+        AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(context);
         assert(drone != NULL);
         this->setControllableEntity(drone);

code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.h

@@ -46 +46 @@
     {
         public:
-            AutonomousDroneController(BaseObject* creator);
+            AutonomousDroneController(Context* context);
             virtual ~AutonomousDroneController();
 

code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc

@@ -43 +43 @@
         The creator of this object.
     */
-    AutonomousDrone::AutonomousDrone(BaseObject* creator) : ControllableEntity(creator)
+    AutonomousDrone::AutonomousDrone(Context* context) : ControllableEntity(context)
     {
         //TODO: Put your code in here:

code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.h

@@ -49 +49 @@
     {
         public:
-            AutonomousDrone(BaseObject* creator);
+            AutonomousDrone(Context* context);
             virtual ~AutonomousDrone();