Changeset 6316

Timestamp:

Dec 10, 2009, 9:48:53 PM (15 years ago)

Author:

scheusso

Message:

fixed NHC behaviour in rocket mode

File:

• code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) (3 diffs)

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -269 +269 @@
     void NewHumanController::doFire(unsigned int firemode)
     {
+        if ( !this->controllableEntity_ )
+            return;
         //if (HumanController::localController_s && HumanController::localController_s->controllableEntity_) {
 
@@ -476 +478 @@
     void NewHumanController::changedControllableEntity()
     {
+        if( this->getControllableEntity() )
+            CCOUT(0) << "changed controllable entity to: " << this->getControllableEntity()->getIdentifier()->getName() << endl;
+        else
+            CCOUT(0) << "changed controllable entity to: " << this->getControllableEntity() << endl;
         this->controlMode_ = 0;
         this->currentYaw_ = 0;
         this->currentPitch_ = 0;
-        if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip")
+        if (this->getControllableEntity() && ( this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip" || this->getControllableEntity()->getIdentifier()->getName() == "Rocket" ))
         {
             this->showOverlays_ = true;
@@ -520 +526 @@
     void NewHumanController::doPauseControl() {
         this->controlPaused_ = true;
-
+        COUT(0) << "pause control" << endl;
         this->hideOverlays();
     }