Добавлена проверка входного массива для метода setTilesPositon(..)

aurusov · Nov 16, 2014 · 1083be0 · 1083be0
1 parent 0fc8b7d
commit 1083be0
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/app/rdo_studio/plugins/game5/src/board.cpp b/app/rdo_studio/plugins/game5/src/board.cpp
@@ -180,19 +180,22 @@ std::vector<unsigned int> Board::getBoardState() const
 
 void Board::setTilesPositon(const std::vector<unsigned int>& newState)
 {
-	for (unsigned int positionIndex = 0; positionIndex < newState.size(); positionIndex++)
+	for (unsigned int positionIndex = 0; positionIndex < newState.size() &&
+			positionIndex < getBoardState().size(); positionIndex++)
 	{
 		unsigned int currentStateIndex = getBoardState()[positionIndex];
-		if (newState[positionIndex] != currentStateIndex)
-			swapTiles(newState[positionIndex], currentStateIndex);
+		swapTiles(newState[positionIndex], currentStateIndex);
 	}
 }
 
 void Board::swapTiles(int first, int second)
 {
-	const unsigned int firstPosition = tiles[first]->getPosition();
-	moveTile(tiles[first], tiles[second]->getPosition());
-	moveTile(tiles[second], firstPosition);
+	if (first != second)
+	{
+		const unsigned int firstPosition = tiles[first]->getPosition();
+		moveTile(tiles[first], tiles[second]->getPosition());
+		moveTile(tiles[second], firstPosition);
+	}
 }
 
 void Board::moveTile(PlacedTile* tile, unsigned int place)