Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 30, 2013, 9:54:58 AM (8 years ago)
Author:
jo
Message:

Updates due to core6 changes.

Location:
code/branches/tutorial4/src/orxonox
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc

    r9678 r9679  
    3838    @brief
    3939        Constructor.
    40     @param creator
    41         The creator of this object.
     40    @param context
     41        The context of this object.
    4242    */
    43     AutonomousDroneController::AutonomousDroneController(BaseObject* creator) : Controller(creator)
     43    AutonomousDroneController::AutonomousDroneController(Context* context) : Controller(context)
    4444    {
    4545        //TODO: Place your code here:
    4646        // Make sure to register the object and create the factory.
    4747
    48         // This checks that our creator really is a drone
     48        // This checks that our context really is a drone
    4949        // and saves the pointer to the drone for the controlling commands
    50         AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(creator);
     50        AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(context);
    5151        assert(drone != NULL);
    5252        this->setControllableEntity(drone);
  • code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.h

    r9678 r9679  
    4646    {
    4747        public:
    48             AutonomousDroneController(BaseObject* creator);
     48            AutonomousDroneController(Context* context);
    4949            virtual ~AutonomousDroneController();
    5050
  • code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc

    r9678 r9679  
    4343        The creator of this object.
    4444    */
    45     AutonomousDrone::AutonomousDrone(BaseObject* creator) : ControllableEntity(creator)
     45    AutonomousDrone::AutonomousDrone(Context* context) : ControllableEntity(context)
    4646    {
    4747        //TODO: Put your code in here:
  • code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.h

    r9678 r9679  
    4949    {
    5050        public:
    51             AutonomousDrone(BaseObject* creator);
     51            AutonomousDrone(Context* context);
    5252            virtual ~AutonomousDrone();
    5353
Note: See TracChangeset for help on using the changeset viewer.