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

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/tetris

Files:

• Tetris.cc (modified) (3 diffs)
• TetrisBrick.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/tetris/Tetris.cc

@@ -104 +104 @@
         }
 
-        for (auto & elem : this->stones_)
-            (elem)->destroy();
+        for (TetrisStone* stone : this->stones_)
+            stone->destroy();
         this->stones_.clear();
     }
@@ -341 +341 @@
     {
         // Spawn a human player.
-        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);
     }
     
@@ -502 +502 @@
         }
       // adjust height of stones above the deleted row //TODO: check if this could be a source of a bug.
-        for(auto & elem : this->stones_)
-        {
-            if(static_cast<unsigned int>(((elem)->getPosition().y - 5)/this->center_->getStoneSize()) > row)
-                (elem)->setPosition((elem)->getPosition()-Vector3(0,10,0));
+        for(TetrisStone* stone : this->stones_)
+        {
+            if(static_cast<unsigned int>((stone->getPosition().y - 5)/this->center_->getStoneSize()) > row)
+                stone->setPosition(stone->getPosition()-Vector3(0,10,0));
         }
 

code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.cc

@@ -239 +239 @@
     {
         assert(this->tetris_);
-        for(auto & elem : this->brickStones_)
-        {
-            elem->detachFromParent();
-            elem->attachToParent(center);
-            elem->setPosition(this->getPosition()+this->tetris_->rotateVector(elem->getPosition(),this->rotationCount_ ));
+        for(TetrisStone* stone : this->brickStones_)
+        {
+            stone->detachFromParent();
+            stone->attachToParent(center);
+            stone->setPosition(this->getPosition()+this->tetris_->rotateVector(stone->getPosition(),this->rotationCount_ ));
         }
         this->brickStones_.clear();