- Timestamp:
- Jul 19, 2009, 3:48:00 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 merged: 3222-3224,3238
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc
r3280 r3325 267 267 if (this->playerID_ != OBJECTID_UNKNOWN) 268 268 { 269 this->player_ = dynamic_cast<PlayerInfo*>(Synchronisable::getSynchronisable(this->playerID_));269 this->player_ = orxonox_cast<PlayerInfo*>(Synchronisable::getSynchronisable(this->playerID_)); 270 270 if (this->player_ && (this->player_->getControllableEntity() != this)) 271 271 this->player_->startControl(this);
Note: See TracChangeset
for help on using the changeset viewer.