Changeset 10768 for code/branches/cpp11_v2/src/orxonox/Scene.cc
- Timestamp:
- Nov 6, 2015, 10:54:34 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/Scene.cc
r10765 r10768 84 84 this->rootSceneNode_ = this->sceneManager_->getRootSceneNode(); 85 85 86 this->radar_ = 0;86 this->radar_ = nullptr; 87 87 } 88 88 … … 92 92 this->positiveWorldRange_ = Vector3::UNIT_SCALE * defaultMaxWorldSize; 93 93 this->gravity_ = Vector3::ZERO; 94 this->physicalWorld_ = 0;95 this->solver_ = 0;96 this->dispatcher_ = 0;97 this->collisionConfig_ = 0;98 this->broadphase_ = 0;94 this->physicalWorld_ = nullptr; 95 this->solver_ = nullptr; 96 this->dispatcher_ = nullptr; 97 this->collisionConfig_ = nullptr; 98 this->broadphase_ = nullptr; 99 99 100 100 this->registerVariables(); … … 234 234 delete this->collisionConfig_; 235 235 delete this->broadphase_; 236 this->physicalWorld_ = 0;237 this->solver_ = 0;238 this->dispatcher_ = 0;239 this->collisionConfig_ = 0;240 this->broadphase_ = 0;236 this->physicalWorld_ = nullptr; 237 this->solver_ = nullptr; 238 this->dispatcher_ = nullptr; 239 this->collisionConfig_ = nullptr; 240 this->broadphase_ = nullptr; 241 241 } 242 242 } … … 327 327 ++i; 328 328 } 329 return 0;329 return nullptr; 330 330 } 331 331
Note: See TracChangeset
for help on using the changeset viewer.