[Orxonox-commit 3893] r8567 - code/branches/presentation/src/modules/tetris

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-05-24 22:17:10 +0200 (Tue, 24 May 2011)
New Revision: 8567

Modified:
   code/branches/presentation/src/modules/tetris/Tetris.cc
   code/branches/presentation/src/modules/tetris/Tetris.h
Log:
Some simplification.


Modified: code/branches/presentation/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/presentation/src/modules/tetris/Tetris.cc	2011-05-24 20:12:42 UTC (rev 8566)
+++ code/branches/presentation/src/modules/tetris/Tetris.cc	2011-05-24 20:17:10 UTC (rev 8567)
@@ -90,15 +90,9 @@
 
         if(this->activeStone_ != NULL)
         {
-            std::pair<bool, TetrisStone*> valid = this->isValidStonePosition(this->activeStone_, this->activeStone_->getPosition());
-            if(!valid.first)
+            if(!this->isValidStonePosition(this->activeStone_, this->activeStone_->getPosition()))
             {
                 this->activeStone_->setVelocity(Vector3::ZERO);
-                if(valid.second != NULL)
-                {
-                    Vector3 position = Vector3(this->activeStone_->getPosition().x, valid.second->getPosition().y+this->center_->getStoneSize(), this->activeStone_->getPosition().z);
-                    this->activeStone_->setPosition(position);
-                }
                 this->createStone();
                 this->startStone();
             }
@@ -128,16 +122,14 @@
         return true;
     }
 
-    std::pair<bool, TetrisStone*> Tetris::isValidStonePosition(TetrisStone* stone, const Vector3& position)
+    bool Tetris::isValidStonePosition(TetrisStone* stone, const Vector3& position)
     {
         assert(stone);
 
-        std::pair<bool, TetrisStone*> valid = std::pair<bool, TetrisStone*>(true, NULL);
-
         if(position.y < this->center_->getStoneSize()/2.0) //!< If the stone has reached the bottom of the level
         {
-            valid.first = false;
             stone->setPosition(Vector3(stone->getPosition().x, this->center_->getStoneSize()/2.0, stone->getPosition().z));
+            return false;
         }
 
         for(std::vector<TetrisStone*>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
@@ -149,13 +141,12 @@
 
             if((position.x == currentStonePosition.x) && (position.y < currentStonePosition.y + this->center_->getStoneSize()))
             {
-                valid.first = false;
-                valid.second = *it;
-                return valid;
+                this->activeStone_->setPosition(Vector3(this->activeStone_->getPosition().x, currentStonePosition.y+this->center_->getStoneSize(), this->activeStone_->getPosition().z));
+                return false;
             }// This case applies if the stones overlap partially vertically
         }
 
-        return valid;
+        return true;
     }
 
     /**

Modified: code/branches/presentation/src/modules/tetris/Tetris.h
===================================================================
--- code/branches/presentation/src/modules/tetris/Tetris.h	2011-05-24 20:12:42 UTC (rev 8566)
+++ code/branches/presentation/src/modules/tetris/Tetris.h	2011-05-24 20:17:10 UTC (rev 8567)
@@ -77,7 +77,7 @@
             void startStone(void); //!< Starts with the first stone.
             void createStone(void);
             void cleanup(void); //!< Cleans up the Gametype by destroying the ball and the bats.
-            std::pair<bool, TetrisStone*> isValidStonePosition(TetrisStone* stone, const Vector3& position);
+            bool isValidStonePosition(TetrisStone* stone, const Vector3& position);
             
             PlayerInfo* player_;