[Orxonox-commit 1498] r6216 - code/branches/presentation2/src/orxonox/controllers

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-12-02 22:08:08 +0100 (Wed, 02 Dec 2009)
New Revision: 6216

Modified:
   code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
Log:
fixed a bug in NewHumanControlled which caused the controller to show the crosshair when opening menu while waiting for spaceship to spawn


Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	2009-12-02 20:59:27 UTC (rev 6215)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	2009-12-02 21:08:08 UTC (rev 6216)
@@ -382,9 +382,9 @@
         this->controlMode_ = 0;
         this->currentYaw_ = 0;
         this->currentPitch_ = 0;
-        if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip") {
-            this->doResumeControl();
-        }
+//         if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip") {
+//             this->doResumeControl();
+//         }
     }
 
     void NewHumanController::accelerate()