Changeset 10916 for code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (8 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

File:

• code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc

@@ -74 +74 @@
         this->gameEnded_ = true;
 
-        for (auto & elem : this->teamnumbers_)
-        {
-            if (elem.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
+        for (auto& mapEntry : this->teamnumbers_)
+        {
+            if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                 continue;
 
-            if (elem.second == attacker_)
-                this->gtinfo_->sendAnnounceMessage("You have won the match!", elem.first->getClientID());
+            if (mapEntry.second == attacker_)
+                this->gtinfo_->sendAnnounceMessage("You have won the match!", mapEntry.first->getClientID());
             else
-                this->gtinfo_->sendAnnounceMessage("You have lost the match!", elem.first->getClientID());
+                this->gtinfo_->sendAnnounceMessage("You have lost the match!", mapEntry.first->getClientID());
         }
     }
@@ -155 +155 @@
                 ChatManager::message(message);
 
-                for (auto & elem : this->teamnumbers_)
-                {
-                    if (elem.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
+                for (auto& mapEntry : this->teamnumbers_)
+                {
+                    if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                         continue;
 
-                    if (elem.second == 1)
-                        this->gtinfo_->sendAnnounceMessage("You have won the match!", elem.first->getClientID());
+                    if (mapEntry.second == 1)
+                        this->gtinfo_->sendAnnounceMessage("You have won the match!", mapEntry.first->getClientID());
                     else
-                        this->gtinfo_->sendAnnounceMessage("You have lost the match!", elem.first->getClientID());
+                        this->gtinfo_->sendAnnounceMessage("You have lost the match!", mapEntry.first->getClientID());
                 }
             }