Changeset 10768 for code/branches/cpp11_v2/src/orxonox/controllers

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (2 diffs)
• Controller.cc (modified) (1 diff)
• DroneController.cc (modified) (1 diff)
• FormationController.cc (modified) (19 diffs)
• HumanController.cc (modified) (2 diffs)
• NewHumanController.cc (modified) (2 diffs)
• WaypointPatrolController.cc (modified) (1 diff)

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

@@ -177 +177 @@
             {
                 this->weaponModes_.clear(); // reset previous weapon information
-                WeaponSlot* wSlot = 0;
+                WeaponSlot* wSlot = nullptr;
                 for(int l=0; (wSlot = pawn->getWeaponSlot(l)) ; l++)
                 {
-                    WeaponMode* wMode = 0;
+                    WeaponMode* wMode = nullptr;
                     for(int i=0; (wMode = wSlot->getWeapon()->getWeaponmode(i)) ; i++)
                     {
@@ -249 +249 @@
             return this->waypoints_[index];
         else
-            return 0;
+            return nullptr;
     }
 

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

@@ -40 +40 @@
         RegisterObject(Controller);
 
-        this->player_ = 0;
-        this->controllableEntity_ = 0;
+        this->player_ = nullptr;
+        this->controllableEntity_ = nullptr;
         this->bGodMode_ = false;
         this->team_=-1;

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

@@ -49 +49 @@
         RegisterObject(DroneController);
 
-        this->owner_ = 0;
-        this->drone_ = 0;
+        this->owner_ = nullptr;
+        this->drone_ = nullptr;
         this->isShooting_ = false;
         this->setAccuracy(10);

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)

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

@@ -65 +65 @@
     RegisterUnloadableClass(HumanController);
 
-    HumanController* HumanController::localController_s = 0;
+    HumanController* HumanController::localController_s = nullptr;
 
     HumanController::HumanController(Context* context) : FormationController(context)
@@ -81 +81 @@
             HumanController::localController_s->removeFromFormation();
         }
-        HumanController::localController_s = 0;
+        HumanController::localController_s = nullptr;
     }
 

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

@@ -58 +58 @@
     RegisterUnloadableClass(NewHumanController);
 
-    NewHumanController* NewHumanController::localController_s = 0;
+    NewHumanController* NewHumanController::localController_s = nullptr;
 
     NewHumanController::NewHumanController(Context* context)
@@ -445 +445 @@
             pawn->setAimPosition( mouseRay.getOrigin() + mouseRay.getDirection() * 3000 );
 
-        if( this->getControllableEntity() && this->getControllableEntity()->getTarget() != 0 )
-            this->getControllableEntity()->setTarget( 0 );
+        if( this->getControllableEntity() && this->getControllableEntity()->getTarget() != nullptr )
+            this->getControllableEntity()->setTarget( nullptr );
 
         //return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getWorldOrientation() * Vector3::NEGATIVE_UNIT_Z * 2000);

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

@@ -101 +101 @@
 
         if (shortestsqdistance > (this->alertnessradius_ * this->alertnessradius_))
-            this->target_ = 0;
+            this->target_ = nullptr;
     }
 }