Changeset 10733 for code/branches/cpp11_v2/src/orxonox

Timestamp:

Oct 31, 2015, 6:11:53 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11 to cpp11_v2

Location:

code/branches/cpp11_v2

Files:

• . (modified) (1 prop)
• src/orxonox/chat/ChatManager.cc (modified) (1 diff)
• src/orxonox/controllers/ArtificialController.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc

@@ -107 +107 @@
 
         // notify all listeners
-        for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
-            it->incomingChat(text, name);
+        for (ChatListener* listener : ObjectList<ChatListener>())
+            listener->incomingChat(text, name);
     }
 

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

@@ -207 +207 @@
     void ArtificialController::setAllBotLevel(float level)
     {
-        for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
-            it->setBotLevel(level);
+        for (ArtificialController* controller : ObjectList<ArtificialController>())
+            controller->setBotLevel(level);
     }
 
@@ -231 +231 @@
     int ArtificialController::getFiremode(std::string name)
     {
-        for (std::map< std::string, int >::iterator it = this->weaponModes_.begin(); it != this->weaponModes_.end(); ++it)
-        {
-            if (it->first == name)
-                return it->second;
+        for (auto firemode : this->weaponModes_)
+        {
+            if (firemode.first == name)
+                return firemode.second;
         }
         return -1;
@@ -259 +259 @@
     {
         WorldEntity* waypoint = NULL;
-        for (ObjectList<WorldEntity>::iterator it = ObjectList<WorldEntity>::begin(); it != ObjectList<WorldEntity>::end(); ++it)
-        {
-            if((*it)->getIdentifier() == ClassByString(name))
+        for (WorldEntity* we : ObjectList<WorldEntity>())
+        {
+            if(we->getIdentifier() == ClassByString(name))
             {
                 ControllableEntity* controllable = this->getControllableEntity();
                 if(!controllable) continue;
-                float actualDistance = ( (*it)->getPosition() - controllable->getPosition() ).length();
+                float actualDistance = ( we->getPosition() - controllable->getPosition() ).length();
                 if(actualDistance > searchDistance || actualDistance < 5.0f) continue;
                     // TODO: PickupSpawner: adjust waypoint accuracy to PickupSpawner's triggerdistance
@@ -271 +271 @@
                 else
                 {
-                    waypoint = *it;
+                    waypoint = we;
                     break;
                 }