Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 10, 2009, 9:48:53 PM (15 years ago)
Author:
scheusso
Message:

fixed NHC behaviour in rocket mode

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

    r6312 r6316  
    269269    void NewHumanController::doFire(unsigned int firemode)
    270270    {
     271        if ( !this->controllableEntity_ )
     272            return;
    271273        //if (HumanController::localController_s && HumanController::localController_s->controllableEntity_) {
    272274
     
    476478    void NewHumanController::changedControllableEntity()
    477479    {
     480        if( this->getControllableEntity() )
     481            CCOUT(0) << "changed controllable entity to: " << this->getControllableEntity()->getIdentifier()->getName() << endl;
     482        else
     483            CCOUT(0) << "changed controllable entity to: " << this->getControllableEntity() << endl;
    478484        this->controlMode_ = 0;
    479485        this->currentYaw_ = 0;
    480486        this->currentPitch_ = 0;
    481         if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip")
     487        if (this->getControllableEntity() && ( this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip" || this->getControllableEntity()->getIdentifier()->getName() == "Rocket" ))
    482488        {
    483489            this->showOverlays_ = true;
     
    520526    void NewHumanController::doPauseControl() {
    521527        this->controlPaused_ = true;
    522 
     528        COUT(0) << "pause control" << endl;
    523529        this->hideOverlays();
    524530    }
Note: See TracChangeset for help on using the changeset viewer.