Changeset 9799

Timestamp:

Nov 21, 2013, 6:37:34 PM (11 years ago)

Author:

jo

Message:

Make controllable entities adapt the controllers team number.

File:

• code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/ControllableEntity.cc

@@ -350 +350 @@
         this->bHasLocalController_ = player->isLocalPlayer();
         this->bHasHumanController_ = player->isHumanPlayer();
+        if(controller_ != NULL)
+            this->team_ = controller_->getTeam(); // forward controller team number
 
         if (this->bHasLocalController_ && this->bHasHumanController_)
@@ -462 +464 @@
             this->bHasLocalController_ = true;
             this->xmlcontroller_->setControllableEntity(this);
+            this->team_ = this->xmlcontroller_->getTeam(); //forward the team number
         }
         else