- Timestamp:
- Nov 4, 2015, 10:25:42 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc
r10216 r10765 48 48 RegisterClass(SpaceShip); 49 49 50 SpaceShip::SpaceShip(Context* context) : Pawn(context), boostBlur_( NULL)50 SpaceShip::SpaceShip(Context* context) : Pawn(context), boostBlur_(nullptr) 51 51 { 52 52 RegisterObject(SpaceShip); … … 196 196 if(this->bEnableMotionBlur_) 197 197 { 198 if (this->boostBlur_ == NULL&& this->hasLocalController() && this->hasHumanController())198 if (this->boostBlur_ == nullptr && this->hasLocalController() && this->hasHumanController()) 199 199 { 200 200 this->boostBlur_ = new Shader(this->getScene()->getSceneManager()); … … 305 305 void SpaceShip::addEngine(orxonox::Engine* engine) 306 306 { 307 OrxAssert(engine != NULL, "The engine cannot be NULL.");307 OrxAssert(engine != nullptr, "The engine cannot be nullptr."); 308 308 this->engineList_.push_back(engine); 309 309 engine->addToSpaceShip(this); … … 330 330 Get the i-th Engine of the SpaceShip. 331 331 @return 332 Returns a pointer to the i-the Engine. NULLif there is no Engine with that index.332 Returns a pointer to the i-the Engine. nullptr if there is no Engine with that index. 333 333 */ 334 334 Engine* SpaceShip::getEngine(unsigned int i) 335 335 { 336 336 if(this->engineList_.size() >= i) 337 return NULL;337 return nullptr; 338 338 else 339 339 return this->engineList_[i]; … … 346 346 The name of the engine to be returned. 347 347 @return 348 Pointer to the engine with the given name, or NULLif not found.348 Pointer to the engine with the given name, or nullptr if not found. 349 349 */ 350 350 Engine* SpaceShip::getEngineByName(const std::string& name) … … 355 355 356 356 orxout(internal_warning) << "Couldn't find Engine with name \"" << name << "\"." << endl; 357 return NULL;357 return nullptr; 358 358 } 359 359 … … 465 465 void SpaceShip::changedEnableMotionBlur() 466 466 { 467 if (!this->bEnableMotionBlur_ && this->boostBlur_ != NULL)467 if (!this->bEnableMotionBlur_ && this->boostBlur_ != nullptr) 468 468 { 469 469 delete this->boostBlur_; 470 this->boostBlur_ = NULL;470 this->boostBlur_ = nullptr; 471 471 } 472 472 } … … 510 510 { 511 511 Camera* camera = CameraManager::getInstance().getActiveCamera(); 512 if(camera != NULL)512 if(camera != nullptr) 513 513 { 514 514 this->cameraOriginalPosition_ = camera->getPosition();
Note: See TracChangeset
for help on using the changeset viewer.