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

Timestamp:

Dec 2, 2015, 11:32:08 PM (9 years ago)

Author:

landauf

Message:

made mapEntry const& wherever possible

Location:

code/branches/cpp11_v2/src/orxonox

Files:

• collisionshapes/CompoundCollisionShape.cc (modified) (2 diffs)
• controllers/ArtificialController.cc (modified) (1 diff)
• gametypes/Dynamicmatch.cc (modified) (8 diffs)
• gametypes/Gametype.cc (modified) (7 diffs)
• gametypes/LastManStanding.cc (modified) (3 diffs)
• gametypes/LastTeamStanding.cc (modified) (3 diffs)
• gametypes/TeamBaseMatch.cc (modified) (1 diff)
• gametypes/TeamDeathmatch.cc (modified) (1 diff)
• gametypes/TeamGametype.cc (modified) (6 diffs)
• gametypes/UnderAttack.cc (modified) (2 diffs)
• weaponsystem/Munition.cc (modified) (2 diffs)
• weaponsystem/Weapon.cc (modified) (3 diffs)
• weaponsystem/WeaponSet.cc (modified) (2 diffs)
• weaponsystem/WeaponSystem.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -65 +65 @@
         {
             // Delete all children
-            for (auto& mapEntry : this->attachedShapes_)
+            for (const auto& mapEntry : this->attachedShapes_)
             {
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
@@ -266 +266 @@
         std::vector<CollisionShape*> shapes;
         // Iterate through all attached CollisionShapes and add them to the list of shapes.
-        for(auto& mapEntry : this->attachedShapes_)
+        for(const auto& mapEntry : this->attachedShapes_)
             shapes.push_back(mapEntry.first);
 

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

@@ -231 +231 @@
     int ArtificialController::getFiremode(std::string name)
     {
-        for (auto& mapEntry : this->weaponModes_)
+        for (const auto& mapEntry : this->weaponModes_)
         {
             if (mapEntry.first == name)

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

@@ -405 +405 @@
     void Dynamicmatch::rewardPig()
     {
-        for (auto& mapEntry : this->playerParty_) //durch alle Spieler iterieren und alle piggys finden
+        for (const auto& mapEntry : this->playerParty_) //durch alle Spieler iterieren und alle piggys finden
         {
             if (mapEntry.second==piggy)//Spieler mit der Pig-party frags++
@@ -441 +441 @@
             if (tutorial) // Announce selectionphase
             {
-             for (auto& mapEntry : this->playerParty_)
+             for (const auto& mapEntry : this->playerParty_)
                 {
                     if (!mapEntry.first)//in order to catch nullpointer
@@ -456 +456 @@
              if(tutorial&&(!notEnoughKillers)&&(!notEnoughChasers)) //Selection phase over
              {
-                  for (auto& mapEntry : this->playerParty_)
+                  for (const auto& mapEntry : this->playerParty_)
                   {
                        if (!mapEntry.first)//in order to catch nullpointer
@@ -490 +490 @@
             if (tutorial) // Announce selectionphase
             {
-             for (auto& mapEntry : this->playerParty_)
+             for (const auto& mapEntry : this->playerParty_)
                 {
                     if (!mapEntry.first)//in order to catch nullpointer
@@ -505 +505 @@
             if(tutorial&&(!notEnoughPigs)&&(!notEnoughChasers)) //Selection phase over
              {
-                  for (auto& mapEntry : this->playerParty_)
+                  for (const auto& mapEntry : this->playerParty_)
                   {
                        if (!mapEntry.first)
@@ -540 +540 @@
             if (tutorial) // Announce selectionphase
             {
-             for (auto& mapEntry : this->playerParty_)
+             for (const auto& mapEntry : this->playerParty_)
                 {
                     if (!mapEntry.first)//in order to catch nullpointer
@@ -555 +555 @@
              if(tutorial&&(!notEnoughPigs)&&(!notEnoughKillers)) //Selection phase over
              {
-                  for (auto& mapEntry : this->playerParty_)
+                  for (const auto& mapEntry : this->playerParty_)
                   {
                        if (!mapEntry.first)
@@ -620 +620 @@
         else if(tutorial) // Announce selectionphase
         {
-            for (auto& mapEntry : this->playerParty_)
+            for (const auto& mapEntry : this->playerParty_)
             {
                 if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)

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

@@ -139 +139 @@
         if (!this->gtinfo_->hasStarted())
         {
-            for (auto& mapEntry : this->players_)
+            for (const auto& mapEntry : this->players_)
             {
                 // Inform the GametypeInfo that the player is ready to spawn.
@@ -169 +169 @@
         }
 
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->getControllableEntity())
@@ -404 +404 @@
                     bool allplayersready = true;
                     bool hashumanplayers = false;
-                    for (auto& mapEntry : this->players_)
+                    for (const auto& mapEntry : this->players_)
                     {
                         if (!mapEntry.first->isReadyToSpawn())
@@ -430 +430 @@
     void Gametype::spawnPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_)
@@ -439 +439 @@
     void Gametype::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.second.state_ == PlayerState::Dead)
                 if (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_)
@@ -538 +538 @@
     GSLevelMementoState* Gametype::exportMementoState()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->isHumanPlayer() && mapEntry.first->getControllableEntity() && mapEntry.first->getControllableEntity()->getCamera())
@@ -587 +587 @@
 
         // find correct player and assign default entity with original position & orientation
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->isHumanPlayer())

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

@@ -56 +56 @@
     void LastManStanding::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.second.state_ == PlayerState::Dead)
             {
@@ -114 +114 @@
     {
         int min=lives;
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
             if (mapEntry.second<=0)
@@ -128 +128 @@
         Gametype::end();
 
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
             if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)

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

@@ -145 +145 @@
     void LastTeamStanding::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.second.state_ == PlayerState::Dead)
             {
@@ -229 +229 @@
         int party = -1;
         //find a player who survived
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
           if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
@@ -255 +255 @@
     {
         int min = lives;
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
             if (mapEntry.second <= 0)

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

@@ -187 +187 @@
             }
 
-            for (auto& mapEntry : this->teamnumbers_)
+            for (const auto& mapEntry : this->teamnumbers_)
             {
                 if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)

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

@@ -69 +69 @@
         int winnerTeam = 0;
         int highestScore = 0;
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if ( this->getTeamScore(mapEntry.first) > highestScore )

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

@@ -99 +99 @@
         std::vector<unsigned int> playersperteam(this->teams_, 0);
 
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
             if (mapEntry.second < static_cast<int>(this->teams_) && mapEntry.second >= 0)
                 playersperteam[mapEntry.second]++;
@@ -141 +141 @@
     void TeamGametype::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)\
+        for (const auto& mapEntry : this->players_)\
         {
             if(allowedInGame_[mapEntry.first] == false)//check if dead player is allowed to enter
@@ -178 +178 @@
         if(!player || this->getTeam(player) == -1)
             return 0;
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if ( this->getTeam(mapEntry.first) ==  this->getTeam(player) )
@@ -191 +191 @@
     {
         int teamSize = 0;
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.second == team)
@@ -202 +202 @@
     {
         int teamSize = 0;
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.second == team  && mapEntry.first->isHumanPlayer())
@@ -376 +376 @@
     void TeamGametype::announceTeamWin(int winnerTeam)
     {
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)

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

@@ -74 +74 @@
         this->gameEnded_ = true;
 
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
@@ -155 +155 @@
                 ChatManager::message(message);
 
-                for (auto& mapEntry : this->teamnumbers_)
+                for (const auto& mapEntry : this->teamnumbers_)
                 {
                     if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)

code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc

@@ -55 +55 @@
     Munition::~Munition()
     {
-        for (auto& mapEntry : this->currentMagazines_)
+        for (const auto& mapEntry : this->currentMagazines_)
             delete mapEntry.second;
     }
@@ -316 +316 @@
             {
                 bool change = false;
-                for (auto& mapEntry : this->currentMagazines_)
+                for (const auto& mapEntry : this->currentMagazines_)
                 {
                     // Add munition if the magazine isn't full (but only to loaded magazines)

code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc

@@ -61 +61 @@
                 this->weaponPack_->removeWeapon(this);
 
-            for (auto& mapEntry : this->weaponmodes_)
+            for (const auto& mapEntry : this->weaponmodes_)
                 mapEntry.second->destroy();
         }
@@ -136 +136 @@
     void Weapon::reload()
     {
-        for (auto& mapEntry : this->weaponmodes_)
+        for (const auto& mapEntry : this->weaponmodes_)
             mapEntry.second->reload();
     }
@@ -148 +148 @@
     void Weapon::notifyWeaponModes()
     {
-        for (auto& mapEntry : this->weaponmodes_)
+        for (const auto& mapEntry : this->weaponmodes_)
             mapEntry.second->setWeapon(this);
     }

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc

@@ -63 +63 @@
     {
         // Fire all WeaponPacks with their defined weaponmode
-        for (auto& mapEntry : this->weaponpacks_)
+        for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
                 mapEntry.first->fire(mapEntry.second);
@@ -71 +71 @@
     {
         // Reload all WeaponPacks with their defined weaponmode
-        for (auto& mapEntry : this->weaponpacks_)
+        for (const auto& mapEntry : this->weaponpacks_)
             mapEntry.first->reload();
     }

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -196 +196 @@
 
         // Assign the desired weaponmode to the firemodes
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
         {
             unsigned int weaponmode = wPack->getDesiredWeaponmode(mapEntry.first);
@@ -219 +219 @@
 
         // Remove all added links from the WeaponSets
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
             mapEntry.second->removeWeaponmodeLink(wPack);
 
@@ -268 +268 @@
         // Check if the WeaponSet belongs to this WeaponSystem
         bool foundWeaponSet = false;
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
         {
             if (mapEntry.second == wSet)
@@ -296 +296 @@
     void WeaponSystem::reload()
     {
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
             mapEntry.second->reload();
     }