[Orxonox-commit 5311] r9974 - code/trunk/src/modules/docking

[landauf at orxonox.net]

Author: landauf
Date: 2014-01-04 15:51:36 +0100 (Sat, 04 Jan 2014)
New Revision: 9974

Modified:
   code/trunk/src/modules/docking/DockToShip.cc
Log:
docking should take actual control, not just temporary.
this also fixes a problem with the boost-shader (after docking, the shader didn't work for the new ship + the game crashed if the new ship died)

Modified: code/trunk/src/modules/docking/DockToShip.cc
===================================================================
--- code/trunk/src/modules/docking/DockToShip.cc	2014-01-04 13:56:03 UTC (rev 9973)
+++ code/trunk/src/modules/docking/DockToShip.cc	2014-01-04 14:51:36 UTC (rev 9974)
@@ -84,7 +84,7 @@
 
         // Make sure target isn't removed when undocking
         dockTo->setDestroyWhenPlayerLeft(false);
-        player->startTemporaryControl(dockTo);
+        player->startControl(dockTo);
 
         return true;
     }