Changeset 6387 for code/branches/presentation2/src/orxonox/infos
- Timestamp:
- Dec 21, 2009, 1:18:36 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc
r6192 r6387 171 171 this->changedControllableEntity(); 172 172 } 173 173 174 174 void PlayerInfo::startTemporaryControl(ControllableEntity* entity) 175 175 { 176 176 if (!entity) 177 177 return; 178 178 179 179 // assert( this->temporaryControllableEntity_==0 ); 180 180 … … 195 195 if ( this->oldControllableEntity_ ) 196 196 this->stopTemporaryControl(); 197 197 198 198 ControllableEntity* entity = this->controllableEntity_; 199 199 … … 213 213 this->changedControllableEntity(); 214 214 } 215 215 216 216 void PlayerInfo::stopTemporaryControl() 217 217 { … … 231 231 if ( GameMode::isMaster() ) 232 232 entity->removePlayer(); 233 234 this->changedControllableEntity(); 235 } 236 233 234 this->changedControllableEntity(); 235 } 236 237 237 void PlayerInfo::networkcallback_changedcontrollableentityID() 238 238 {
Note: See TracChangeset
for help on using the changeset viewer.