Changeset 9907 for code/branches/presentationHS13/src/modules/docking/MoveToDockingTarget.cc

Timestamp:

Dec 16, 2013, 2:22:45 PM (12 years ago)

Author:

smerkli

Message:

Merged spacestationentry branch

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• src/modules/docking/MoveToDockingTarget.cc (modified) (1 diff)

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

@@ -66 +66 @@
     {
         //TODO: Investigate strange things...
-        this->parent_->detach((WorldEntity*)player->getControllableEntity());
+        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
 
+        //TODO: Check the issue with this detach call.
+        //I have removed the line because the detach call only caused a warning and terminated. And because I didn't find a attach call either.
+        //Didn't find the need for the line.
         this->parent_->undockingAnimationFinished(player);
         return true;