Changeset 8567

Timestamp:

May 24, 2011, 10:17:10 PM (14 years ago)

Author:

dafrick

Message:

Some simplification.

Location:

code/branches/presentation/src/modules/tetris

Files:

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

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

@@ -91 +91 @@
         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();
@@ -129 +123 @@
     }
 
-    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;
         }
 
@@ -150 +142 @@
             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;
     }
 

code/branches/presentation/src/modules/tetris/Tetris.h

@@ -78 +78 @@
             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_;