Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-18 10:26:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow more types of invalid input when previewing a move being played

Browse source
This commit is contained in:
Olivier Teulière 2012-12-26 18:05:11 +01:00
parent a9f5935285
commit 2c3cb83e0a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/board.cpp
View file

@ -351,7 +351,7 @@ int Board::checkRoundAux(const Matrix<Tile> &iTilesMx,
// We may not be allowed to use so many letters from the rack // We may not be allowed to use so many letters from the rack
// (cf. "7 among 8" variant) // (cf. "7 among 8" variant)
if (fromrack > m_params.getLettersToPlay()) if (checkJunction && fromrack > m_params.getLettersToPlay())
return 9; return 9;
// The word must cover at least one anchor square, except // The word must cover at least one anchor square, except

2
game/game.cpp
View file

@ -576,7 +576,7 @@ int Game::checkPlayedWord(const wstring &iCoord,
return 10; return 10;
} }
if (checkRack) if (checkWordAndJunction && checkRack)
{ {
// Check that the word can be formed with the tiles in the rack: // 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 // we first create a copy of the rack, then we remove the tiles