Changeset 6045 for code/branches/steering/src/orxonox/infos
- Timestamp:
- Nov 11, 2009, 5:39:53 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/steering/src/orxonox/infos/PlayerInfo.cc
r5993 r6045 138 138 assert(this->controller_); 139 139 this->controller_->setPlayer(this); 140 if (this->controllableEntity_) 140 if (this->controllableEntity_) { 141 141 this->controller_->setControllableEntity(this->controllableEntity_); 142 this->controllableEntity_->setController(this->controller_); 143 } 142 144 this->changedController(); 143 145 } … … 158 160 this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_); 159 161 160 if (this->controller_) 162 if (this->controller_) { 161 163 this->controller_->setControllableEntity(entity); 164 this->controllableEntity_->setController(this->controller_); 165 } 162 166 163 167 this->changedControllableEntity(); … … 171 175 return; 172 176 177 this->controllableEntity_->setController(0); 173 178 this->controllableEntity_ = 0; 174 179 this->controllableEntityID_ = OBJECTID_UNKNOWN;
Note: See TracChangeset
for help on using the changeset viewer.