Changeset 10768 for code/branches/cpp11_v2/src/orxonox/infos
- Timestamp:
- Nov 6, 2015, 10:54:34 PM (10 years ago)
- Location:
- code/branches/cpp11_v2/src/orxonox/infos
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc
r10624 r10768 53 53 this->defaultController_ = Class(NewHumanController); 54 54 55 this->humanHud_ = 0;56 this->gametypeHud_ = 0;55 this->humanHud_ = nullptr; 56 this->gametypeHud_ = nullptr; 57 57 58 58 this->setConfigValues(); … … 178 178 { 179 179 this->humanHud_->destroy(); 180 this->humanHud_ = 0;180 this->humanHud_ = nullptr; 181 181 } 182 182 … … 194 194 { 195 195 this->gametypeHud_->destroy(); 196 this->gametypeHud_ = 0;196 this->gametypeHud_ = nullptr; 197 197 } 198 198 -
code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc
r10765 r10768 51 51 this->bReadyToSpawn_ = false; 52 52 this->bSetUnreadyAfterSpawn_ = true; 53 this->controller_ = 0;54 this->controllableEntity_ = 0;53 this->controller_ = nullptr; 54 this->controllableEntity_ = nullptr; 55 55 this->controllableEntityID_ = OBJECTID_UNKNOWN; 56 56 57 this->gtinfo_ = 0;57 this->gtinfo_ = nullptr; 58 58 this->gtinfoID_ = OBJECTID_UNKNOWN; 59 59 this->updateGametypeInfo(this->getGametype()); … … 72 72 { 73 73 this->controller_->destroy(); 74 this->controller_ = 0;74 this->controller_ = nullptr; 75 75 } 76 76 … … 126 126 void PlayerInfo::updateGametypeInfo(Gametype* gametype) 127 127 { 128 this->gtinfo_ = 0;128 this->gtinfo_ = nullptr; 129 129 this->gtinfoID_ = OBJECTID_UNKNOWN; 130 130 … … 141 141 { 142 142 this->controller_->destroy(); 143 this->controller_ = 0;143 this->controller_ = nullptr; 144 144 } 145 145 this->controller_ = this->defaultController_.fabricate(this->getContext()); … … 214 214 return; 215 215 216 this->controllableEntity_->setController( 0);217 this->controllableEntity_ = 0;216 this->controllableEntity_->setController(nullptr); 217 this->controllableEntity_ = nullptr; 218 218 this->controllableEntityID_ = OBJECTID_UNKNOWN; 219 219 220 220 if (this->controller_) 221 this->controller_->setControllableEntity( 0);221 this->controller_->setControllableEntity(nullptr); 222 222 223 223 if ( GameMode::isMaster() ) … … 242 242 tmp->setActive(false); 243 243 //this->controllableEntity_->getController()->setControllableEntity(nullptr); 244 this->controllableEntity_->setController( 0);244 this->controllableEntity_->setController(nullptr); 245 245 } 246 246 … … 253 253 return; 254 254 255 this->controllableEntity_->setController( 0);255 this->controllableEntity_->setController(nullptr); 256 256 if(this->isHumanPlayer()) // TODO: Multiplayer? 257 257 this->controllableEntity_->destroyHud(); // HACK-ish
Note: See TracChangeset
for help on using the changeset viewer.