Changeset 7163 for code/trunk/src/orxonox/infos/PlayerInfo.cc
- Timestamp:
- Aug 11, 2010, 8:55:13 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/infos/PlayerInfo.cc
r6417 r7163 177 177 return; 178 178 179 // assert( this->temporaryControllableEntity_==0 );179 assert( this->oldControllableEntity_==0 ); 180 180 181 181 this->oldControllableEntity_ = this->controllableEntity_; … … 184 184 185 185 entity->setPlayer(this); 186 entity->setController(this->controller_); 186 187 187 188 if (this->controller_) … … 222 223 return; 223 224 225 this->controllableEntity_->setController(0); 226 224 227 this->controllableEntity_ = this->oldControllableEntity_; 225 228 this->controllableEntityID_ = this->controllableEntity_->getObjectID();
Note: See TracChangeset
for help on using the changeset viewer.