Changeset 8544 for code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc

Timestamp:

May 23, 2011, 4:12:27 PM (13 years ago)

Author:

sven

Message:

Spaceships attach now to the dock, fixed DockingController.

File:

• code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc (modified) (2 diffs)

code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc

@@ -53 +53 @@
     {
         assert(parent);
-        parent->dockingAnimationFinished(player);
+
+        DockingController *dockingController = new DockingController(this);
+        dockingController->setDock(parent);
+        dockingController->setPlayer(player);
+        dockingController->takeControl(true);
+
         return true;
     }
@@ -59 +64 @@
     bool MoveToDockingTarget::release(PlayerInfo *player)
     {
-        assert(parent);
+        //TODO: Investigate strange things...
+        parent->detach((WorldEntity*)player->getControllableEntity());
+
         parent->undockingAnimationFinished(player);
         return true;