Changeset 8544 for code/branches/dockingsystem2/src/orxonox

Timestamp:

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

Author:

sven

Message:

Spaceships attach now to the dock, fixed DockingController.

Location:

code/branches/dockingsystem2/src/orxonox/infos

Files:

• PlayerInfo.cc (modified) (1 diff)
• PlayerInfo.h (modified) (1 diff)

code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc

@@ -213 +213 @@
     }
 
+    void PlayerInfo::pauseControl()
+    {
+        ControllableEntity* entity = this->controllableEntity_;
+
+        if (!entity)
+            return;
+
+        this->controllableEntity_->getController()->setActive(false);
+        //this->controllableEntity_->getController()->setControllableEntity(NULL);
+        this->controllableEntity_->setController(0);
+    }
+
     void PlayerInfo::stopTemporaryControl()
     {

code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.h

@@ -68 +68 @@
             void startControl(ControllableEntity* entity);
             void stopControl();
+            void pauseControl();
             void startTemporaryControl(ControllableEntity* entity);
             void stopTemporaryControl();