Changeset 8566 for code/branches/presentation

Timestamp:

May 24, 2011, 10:12:42 PM (13 years ago)

Author:

dafrick

Message:

Fixing another bug.

Location:

code/branches/presentation/src/modules/tetris

Files:

• Tetris.cc (modified) (2 diffs)
• Tetris.h (modified) (1 diff)
• TetrisStone.cc (modified) (1 diff)

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

@@ -106 +106 @@
     }
 
-    std::pair<bool, TetrisStone*> Tetris::isValidMove(TetrisStone* stone, const Vector3& position)
+    bool Tetris::isValidMove(TetrisStone* stone, const Vector3& position)
     {
         assert(stone);
 
-        std::pair<bool, TetrisStone*> valid = std::pair<bool, TetrisStone*>(true, NULL);
-        
         if(position.x < this->center_->getStoneSize()/2.0)  //!< If the stone touches the left edge of the level
-            valid.first = false;
+            return false;
         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;
+            return false;
 
         for(std::vector<TetrisStone*>::const_iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
@@ -124 +122 @@
             const Vector3& currentStonePosition = (*it)->getPosition(); //!< Saves the position of the currentStone
 
-            if((position.x == currentStonePosition.x) && (position.y == currentStonePosition.y))
-            {
-                stone->setVelocity(Vector3::ZERO);
-                this->createStone();
-                this->startStone();
-                valid.first = false;
-                return valid;
-            }// This case applies if the stones overlap completely
-        }
-
-        return valid;
+            if((position.x == currentStonePosition.x) && abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
+                return false;
+        }
+
+        return true;
     }
 

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

@@ -69 +69 @@
             PlayerInfo* getPlayer(void) const; //!< Get the player.
 
-            std::pair<bool, TetrisStone*> isValidMove(TetrisStone* stone, const Vector3& position);
+            bool isValidMove(TetrisStone* stone, const Vector3& position);
 
         protected:

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

@@ -82 +82 @@
             const Vector3& position = this->getPosition();
             Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
-            if(!this->tetris_->isValidMove(this, newPos).first)
+            if(!this->tetris_->isValidMove(this, newPos))
                 return;
 
-            //this->previousPosition_ = position;
             this->setPosition(newPos);
             this->delay_ = true;