Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-25 21:59:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rack: add a contains() convenience method

Browse source
This commit is contained in:
Olivier Teulière 2013-01-17 17:58:56 +01:00
parent b493b3b365
commit 33214c62b2
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
game/board_search.cpp
View file

@ -136,11 +136,11 @@ void BoardSearch::leftPart(Rack &iRack, Round &ioPartialWord,
if (iLimit > 0) if (iLimit > 0)
{ {
bool hasJokerInRack = iRack.count(Tile::Joker()); bool hasJokerInRack = iRack.contains(Tile::Joker());
for (unsigned int succ = m_dic.getSucc(n); succ; succ = m_dic.getNext(succ)) for (unsigned int succ = m_dic.getSucc(n); succ; succ = m_dic.getNext(succ))
{ {
const Tile &l = Tile(m_dic.getChar(succ)); const Tile &l = Tile(m_dic.getChar(succ));
if (iRack.count(l)) if (iRack.contains(l))
{ {
iRack.remove(l); iRack.remove(l);
ioPartialWord.addRightFromRack(l, false); ioPartialWord.addRightFromRack(l, false);
@ -182,13 +182,13 @@ void BoardSearch::extendRight(Rack &iRack, Round &ioPartialWord,
if (m_crossMx[iRow][iCol].isNone()) if (m_crossMx[iRow][iCol].isNone())
return; return;
bool hasJokerInRack = iRack.count(Tile::Joker()); bool hasJokerInRack = iRack.contains(Tile::Joker());
for (unsigned int succ = m_dic.getSucc(iNode); succ; succ = m_dic.getNext(succ)) for (unsigned int succ = m_dic.getSucc(iNode); succ; succ = m_dic.getNext(succ))
{ {
const Tile &l = Tile(m_dic.getChar(succ)); const Tile &l = Tile(m_dic.getChar(succ));
if (m_crossMx[iRow][iCol].check(l)) if (m_crossMx[iRow][iCol].check(l))
{ {
if (iRack.count(l)) if (iRack.contains(l))
{ {
iRack.remove(l); iRack.remove(l);
ioPartialWord.addRightFromRack(l, false); ioPartialWord.addRightFromRack(l, false);

2
game/freegame.cpp
View file

@ -270,7 +270,7 @@ int FreeGame::checkPass(const Player &iPlayer,
BOOST_FOREACH(wchar_t wch, iToChange) BOOST_FOREACH(wchar_t wch, iToChange)
{ {
// Remove the letter from the rack // Remove the letter from the rack
if (!rack.count(Tile(wch))) if (!rack.contains(Tile(wch)))
{ {
return 2; return 2;
} }

4
game/game.cpp
View file

@ -497,7 +497,7 @@ PlayedRack Game::helperSetRackRandom(const PlayedRack &iPld,
// We need to swap the joker (it is necessarily in the // We need to swap the joker (it is necessarily in the
// new tiles, because jokerAdded is true) // new tiles, because jokerAdded is true)
Rack tmpRack = pld.getNew(); Rack tmpRack = pld.getNew();
ASSERT(tmpRack.count(Tile::Joker()), "No joker found in the new tiles"); ASSERT(tmpRack.contains(Tile::Joker()), "No joker found in the new tiles");
tmpRack.remove(Tile::Joker()); tmpRack.remove(Tile::Joker());
tmpRack.add(replacingTile); tmpRack.add(replacingTile);
pld.setNew(tmpRack); pld.setNew(tmpRack);
@ -678,7 +678,7 @@ int Game::checkPlayedWord(const wstring &iCoord,
else else
t = round.getTile(i); t = round.getTile(i);
if (!rack.count(t)) if (!rack.contains(t))
{ {
return 4; return 4;
} }

2
game/rack.h
View file

@ -45,6 +45,8 @@ public:
bool isEmpty() const { return getNbTiles() == 0; } bool isEmpty() const { return getNbTiles() == 0; }
unsigned count(const Tile &t) const { return m_tiles[t.toCode()]; } unsigned count(const Tile &t) const { return m_tiles[t.toCode()]; }
bool contains(const Tile &t) const { return count(t); }
void add(const Tile &t) { m_tiles[t.toCode()]++; m_nbTiles++; } void add(const Tile &t) { m_tiles[t.toCode()]++; m_nbTiles++; }
void remove(const Tile &t); void remove(const Tile &t);
void clear(); void clear();