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

Board: use the isVacant() method a bit more

Browse source
This commit is contained in:
Olivier Teulière 2012-02-18 21:02:30 +01:00
parent 16a9a9b1a9
commit 1336e3b65d
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
game/board.cpp
View file

@ -142,11 +142,8 @@ bool Board::isJoker(int iRow, int iCol) const
bool Board::isVacant(int iRow, int iCol) const
{
if (iRow < 1 || iRow > BOARD_DIM ||
iCol < 1 || iCol > BOARD_DIM)
{
return false;
}
ASSERT(iRow >= BOARD_MIN && iRow <= BOARD_MAX &&
iCol >= BOARD_MIN && iCol <= BOARD_MAX, "Invalid coordinates");
return m_tilesRow[iRow][iCol].isEmpty();
}
@ -160,7 +157,7 @@ void Board::addRound(const Dictionary &iDic, const Round &iRound)
Tile t;
for (unsigned int i = 0; i < iRound.getWordLen(); i++)
{
if (m_tilesRow[row][col + i].isEmpty())
if (isVacant(row, col + i))
{
t = iRound.getTile(i);
m_tilesRow[row][col + i] = t;
@ -175,7 +172,7 @@ void Board::addRound(const Dictionary &iDic, const Round &iRound)
Tile t;
for (unsigned int i = 0; i < iRound.getWordLen(); i++)
{
if (m_tilesRow[row + i][col].isEmpty())
if (isVacant(row + i, col))
{
t = iRound.getTile(i);
m_tilesRow[row + i][col] = t;
@ -242,7 +239,7 @@ void Board::removeRound(const Dictionary &iDic, const Round &iRound)
{
for (int j = 1; j <= BOARD_DIM; j++)
{
if (!m_tilesRow[i][j].isEmpty())
if (!isVacant(i, j))
return;
}
}
@ -413,7 +410,7 @@ void Board::testRound(const Round &iRound)
{
for (unsigned int i = 0; i < iRound.getWordLen(); i++)
{
if (m_tilesRow[row][col + i].isEmpty())
if (isVacant(row, col + i))
{
t = iRound.getTile(i);
m_tilesRow[row][col + i] = t;
@ -429,7 +426,7 @@ void Board::testRound(const Round &iRound)
{
for (unsigned int i = 0; i < iRound.getWordLen(); i++)
{
if (m_tilesRow[row + i][col].isEmpty())
if (isVacant(row + i, col))
{
t = iRound.getTile(i);
m_tilesRow[row + i][col] = t;