Changeset 8565 for code/branches/presentation/src

Timestamp:

May 24, 2011, 9:59:01 PM (14 years ago)

Author:

dafrick

Message:

Fixing bug in tetris.

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->isValidMove(this->activeStone_, this->activeStone_->getPosition());
+            std::pair<bool, TetrisStone*> valid = this->isValidStonePosition(this->activeStone_, this->activeStone_->getPosition());
             if(!valid.first)
             {
@@ -116 +116 @@
         else if(position.x > (this->center_->getWidth()-0.5)*this->center_->getStoneSize()) //!< If the stone touches the right edge of the level
             valid.first = false;
-        else 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));
-        }
 
         for(std::vector<TetrisStone*>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
@@ -137 +132 @@
                 return valid;
             }// This case applies if the stones overlap completely
-            else if((position.x == currentStonePosition.x) && (position.y < currentStonePosition.y + this->center_->getStoneSize()))
+        }
+
+        return valid;
+    }
+
+    std::pair<bool, TetrisStone*> 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));
+        }
+
+        for(std::vector<TetrisStone*>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
+        {
+            if(stone == *it)
+                continue;
+
+            const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
+
+            if((position.x == currentStonePosition.x) && (position.y < currentStonePosition.y + this->center_->getStoneSize()))
             {
                 valid.first = false;

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);
             
             PlayerInfo* player_;