Changeset 8560 for code/branches/dockingsystem2/src/modules/docking/DockingController.cc

Timestamp:

May 24, 2011, 4:33:48 PM (13 years ago)

Author:

dafrick

Message:

Some cleanup.

File:

• code/branches/dockingsystem2/src/modules/docking/DockingController.cc (modified) (3 diffs)

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

@@ -93 +93 @@
         if (docking)
         {
-            COUT(0) << "DockingController::takeControl Taking over control." << std::endl;
+            COUT(4) << "DockingController::takeControl Taking over control." << std::endl;
 
             entity->setDestroyWhenPlayerLeft(false);
@@ -104 +104 @@
     void DockingController::positionReached()
     {
-        COUT(0) << "DockingController::positionReached() called." << std::endl;
+        COUT(4) << "DockingController::positionReached() called." << std::endl;
 
         assert(this->player);
@@ -110 +110 @@
 
         // stop spaceship
-        dock->attach(entity);
+        entity->setPosition(dock->getWorldPosition());
         entity->setVelocity(0, 0, 0);
-        entity->setOrientation(dock->getOrientation());
+        entity->setOrientation(dock->getWorldOrientation());
 
         // give control back to player