Changeset 10916 for code/branches/cpp11_v2/src/modules/pong

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 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

Location:

code/branches/cpp11_v2/src/modules/pong

Files:

• Pong.cc (modified) (2 diffs)
• PongAI.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/pong/Pong.cc

@@ -145 +145 @@
 
             // If one of the bats is missing, create it. Apply the template for the bats as specified in the centerpoint.
-            for (auto & elem : this->bat_)
+            for (WeakPtr<orxonox::PongBat>& bat : this->bat_)
             {
-                if (elem == nullptr)
+                if (bat == nullptr)
                 {
-                    elem = new PongBat(this->center_->getContext());
-                    elem->addTemplate(this->center_->getBattemplate());
+                    bat = new PongBat(this->center_->getContext());
+                    bat->addTemplate(this->center_->getBattemplate());
                 }
             }
@@ -211 +211 @@
     {
         // first spawn human players to assign always the left bat to the player in singleplayer
-        for (auto & elem : this->players_)
-            if (elem.first->isHumanPlayer() && (elem.first->isReadyToSpawn() || this->bForceSpawn_))
-                this->spawnPlayer(elem.first);
+        for (auto& mapEntry : this->players_)
+            if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
+                this->spawnPlayer(mapEntry.first);
         // now spawn bots
-        for (auto & elem : this->players_)
-            if (!elem.first->isHumanPlayer() && (elem.first->isReadyToSpawn() || this->bForceSpawn_))
-                this->spawnPlayer(elem.first);
+        for (auto& mapEntry : this->players_)
+            if (!mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
+                this->spawnPlayer(mapEntry.first);
     }
 

code/branches/cpp11_v2/src/modules/pong/PongAI.cc

@@ -77 +77 @@
     PongAI::~PongAI()
     {
-        for (auto & elem : this->reactionTimers_)
-            elem.first->destroy();
+        for (std::pair<Timer*, char>& pair : this->reactionTimers_)
+            pair.first->destroy();
     }