Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9799 for code


Ignore:
Timestamp:
Nov 21, 2013, 6:37:34 PM (11 years ago)
Author:
jo
Message:

Make controllable entities adapt the controllers team number.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/worldentities/ControllableEntity.cc

    r9667 r9799  
    350350        this->bHasLocalController_ = player->isLocalPlayer();
    351351        this->bHasHumanController_ = player->isHumanPlayer();
     352        if(controller_ != NULL)
     353            this->team_ = controller_->getTeam(); // forward controller team number
    352354
    353355        if (this->bHasLocalController_ && this->bHasHumanController_)
     
    462464            this->bHasLocalController_ = true;
    463465            this->xmlcontroller_->setControllableEntity(this);
     466            this->team_ = this->xmlcontroller_->getTeam(); //forward the team number
    464467        }
    465468        else
Note: See TracChangeset for help on using the changeset viewer.