Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-27 09:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

BoardLayout: make a method public, and use it to simplify an assertion

Browse source
This commit is contained in:
Olivier Teulière 2013-01-18 12:13:20 +01:00
parent 7923ed2c2a
commit 80fa47d71b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
game/board.cpp
View file

@ -94,9 +94,7 @@ bool Board::isJoker(int iRow, int iCol) const
bool Board::isVacant(int iRow, int iCol) const bool Board::isVacant(int iRow, int iCol) const
{ {
ASSERT(iRow >= 1 && (unsigned)iRow <= m_layout.getRowCount() && ASSERT(m_layout.isValidCoord(iRow, iCol), "Invalid coordinates");
iCol >= 1 && (unsigned)iCol <= m_layout.getColCount(),
"Invalid coordinates");
return m_tilesRow[iRow][iCol].isEmpty(); return m_tilesRow[iRow][iCol].isEmpty();
} }

4
game/board_layout.h
View file

@ -34,6 +34,8 @@ class BoardLayout
public: public:
BoardLayout(); BoardLayout();
bool isValidCoord(unsigned iRow, unsigned iCol) const;
unsigned getRowCount() const; unsigned getRowCount() const;
unsigned getColCount() const; unsigned getColCount() const;
int getWordMultiplier(unsigned iRow, unsigned iCol) const; int getWordMultiplier(unsigned iRow, unsigned iCol) const;
@ -48,8 +50,6 @@ private:
Matrix<int> m_wordMultipliers; Matrix<int> m_wordMultipliers;
Matrix<int> m_tileMultipliers; Matrix<int> m_tileMultipliers;
bool isValidCoord(unsigned iRow, unsigned iCol) const;
void setDefaultLayout(); void setDefaultLayout();
}; };