Changeset 10919 for code/branches/cpp11_v2/src/modules/objects/controllers

Timestamp:

Dec 5, 2015, 10:47:51 PM (9 years ago)

Author:

landauf

Message:

use range-based for-loop where it makes sense (e.g. ObjectList)

File:

• code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc

@@ -103 +103 @@
         Pawn* minScorePawn = nullptr;
 
-        for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
-        {
-            Pawn* entity = orxonox_cast<Pawn*>(*it);
-            if (!entity || FormationController::sameTeam(turret, entity, this->getGametype()))
+        for (Pawn* pawn : ObjectList<Pawn>())
+        {
+            if (!pawn || FormationController::sameTeam(turret, pawn, this->getGametype()))
                 continue;
-            tempScore = turret->isInRange(entity);
+            tempScore = turret->isInRange(pawn);
             if(tempScore != -1.f)
             {
@@ -114 +113 @@
                 {
                     minScore = tempScore;
-                    minScorePawn = entity;
+                    minScorePawn = pawn;
                 }
             }