From 2c3cb83e0aeb67c940122d2d93b6a77e998785b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= Date: Wed, 26 Dec 2012 18:05:11 +0100 Subject: [PATCH] Allow more types of invalid input when previewing a move being played --- game/board.cpp | 2 +- game/game.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/game/board.cpp b/game/board.cpp index c3a6699..bb65f6e 100644 --- a/game/board.cpp +++ b/game/board.cpp @@ -351,7 +351,7 @@ int Board::checkRoundAux(const Matrix &iTilesMx, // We may not be allowed to use so many letters from the rack // (cf. "7 among 8" variant) - if (fromrack > m_params.getLettersToPlay()) + if (checkJunction && fromrack > m_params.getLettersToPlay()) return 9; // The word must cover at least one anchor square, except diff --git a/game/game.cpp b/game/game.cpp index 4c4df2b..386583a 100644 --- a/game/game.cpp +++ b/game/game.cpp @@ -576,7 +576,7 @@ int Game::checkPlayedWord(const wstring &iCoord, return 10; } - if (checkRack) + if (checkWordAndJunction && checkRack) { // Check that the word can be formed with the tiles in the rack: // we first create a copy of the rack, then we remove the tiles