Changeset 10768 for code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc

Timestamp:

Nov 6, 2015, 10:54:34 PM (8 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified) (19 diffs)

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

@@ -72 +72 @@
         RegisterObject(FormationController);
 
-        this->target_ = 0;
+        this->target_ = nullptr;
         this->formationFlight_ = false;
         this->passive_ = false;
         this->maxFormationSize_ = STANDARD_MAX_FORMATION_SIZE;
-        this->myMaster_ = 0;
+        this->myMaster_ = nullptr;
         this->freedomCount_ = 0;
 
@@ -104 +104 @@
                     {
                         orxout(internal_error) << this << " is still master in " << (*it) << endl;
-                        it->myMaster_ = 0;
+                        it->myMaster_ = nullptr;
                     }
 
@@ -142 +142 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            Controller* controller = 0;
+            Controller* controller = nullptr;
 
             if (it->getController())
@@ -173 +173 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            Controller* controller = 0;
+            Controller* controller = nullptr;
 
             if (it->getController())
@@ -203 +203 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            Controller* controller = 0;
+            Controller* controller = nullptr;
 
             if (it->getController())
@@ -230 +230 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            Controller* controller = 0;
+            Controller* controller = nullptr;
 
             if (it->getController())
@@ -383 +383 @@
         }
 
-        this->myMaster_ = 0;
+        this->myMaster_ = nullptr;
         this->state_ = FREE;
     }
@@ -411 +411 @@
 
             //has it an FormationController?
-            Controller* controller = 0;
+            Controller* controller = nullptr;
 
             if (it->getController())
@@ -458 +458 @@
         {
             this->state_ = MASTER;
-            this->myMaster_ = 0;
+            this->myMaster_ = nullptr;
         }
     }
@@ -518 +518 @@
             newMaster->state_ = MASTER;
             newMaster->slaves_ = this->slaves_;
-            newMaster->myMaster_ = 0;
+            newMaster->myMaster_ = nullptr;
 
             for(std::vector<FormationController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
@@ -547 +547 @@
                 newMaster->state_ = MASTER;
                 newMaster->slaves_ = this->slaves_;
-                newMaster->myMaster_ = 0;
+                newMaster->myMaster_ = nullptr;
 
                 for(std::vector<FormationController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
@@ -572 +572 @@
         {
             (*it)->state_ = FREE;
-            (*it)->myMaster_ = 0;
+            (*it)->myMaster_ = nullptr;
         }
         this->slaves_.clear();
@@ -629 +629 @@
 
         //search new Master, then take lead
-        if (this->state_==FREE && this->myMaster_==0)
+        if (this->state_==FREE && this->myMaster_==nullptr)
         {
           searchNewMaster();
@@ -654 +654 @@
                  (*it)->myMaster_=this;
             }
-            this->myMaster_=0;
+            this->myMaster_=nullptr;
             this->state_=MASTER;
         }
@@ -779 +779 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            Controller* controller = 0;
+            Controller* controller = nullptr;
 
             if (it->getController())
@@ -943 +943 @@
     void FormationController::forgetTarget()
     {
-        this->target_ = 0;
+        this->target_ = nullptr;
         this->bShooting_ = false;
     }
@@ -963 +963 @@
         int team2 = entity2->getTeam();
 
-        Controller* controller = 0;
+        Controller* controller = nullptr;
         if (entity1->getController())
             controller = entity1->getController();
@@ -996 +996 @@
         }
 
-        TeamBaseMatchBase* base = 0;
+        TeamBaseMatchBase* base = nullptr;
         base = orxonox_cast<TeamBaseMatchBase*>(entity1);
         if (base)
@@ -1030 +1030 @@
         }
 
-        DroneController* droneController = 0;
+        DroneController* droneController = nullptr;
         droneController = orxonox_cast<DroneController*>(entity1->getController());
         if (droneController && static_cast<ControllableEntity*>(droneController->getOwner()) == entity2)