Changeset 10765 for code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc

@@ -56 +56 @@
         this->currentWaypoint_ = 0;
         this->setAccuracy(5);
-        this->defaultWaypoint_ = NULL;
+        this->defaultWaypoint_ = nullptr;
         this->mode_ = DEFAULT;//Vector-implementation: mode_.push_back(DEFAULT);
     }
@@ -222 +222 @@
     {
         SpaceShip* ship = orxonox_cast<SpaceShip*>(this->getControllableEntity());
-        if(ship == NULL) return;
+        if(ship == nullptr) return;
         if(ship->getBoostPower()*1.5f > ship->getInitialBoostPower() ) //upper limit ->boost
             this->getControllableEntity()->boost(true);
@@ -258 +258 @@
     void ArtificialController::updatePointsOfInterest(std::string name, float searchDistance)
     {
-        WorldEntity* waypoint = NULL;
+        WorldEntity* waypoint = nullptr;
         for (WorldEntity* we : ObjectList<WorldEntity>())
         {