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

New utility methods to get the lowercase (joker) or uppercase (no joker) variant of a tile

Browse source
This commit is contained in:
Olivier Teulière 2012-02-18 23:52:07 +01:00
parent 0d45fc6227
commit 0be2769dfa
5 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dic/tile.cpp
View file

@ -27,6 +27,7 @@
#include "header.h" #include "header.h"
#include "encoding.h" #include "encoding.h"
#include "dic_exception.h" #include "dic_exception.h"
#include "debug.h"
INIT_LOGGER(dic, Tile); INIT_LOGGER(dic, Tile);
@ -149,6 +150,22 @@ unsigned int Tile::toCode() const
} }
Tile Tile::toLower() const
{
ASSERT(iswalpha(m_char),
"toLower() should be called on alphabetical tiles");
return Tile(towlower(m_char));
}
Tile Tile::toUpper() const
{
ASSERT(iswalpha(m_char),
"toUpper() should be called on alphabetical tiles");
return Tile(towupper(m_char));
}
bool Tile::operator<(const Tile &iOther) const bool Tile::operator<(const Tile &iOther) const
{ {
if (m_joker) if (m_joker)

5
dic/tile.h
View file

@ -64,6 +64,11 @@ public:
wstring getDisplayStr() const; wstring getDisplayStr() const;
vector<wstring> getInputStr() const; vector<wstring> getInputStr() const;
/// Return a copy of this tile, as a (non pure) joker
Tile toLower() const;
/// Return a copy of this tile, without joker information
Tile toUpper() const;
static const Tile &Joker() { return m_TheJoker; } static const Tile &Joker() { return m_TheJoker; }
bool operator <(const Tile &iOther) const; bool operator <(const Tile &iOther) const;

14
game/board.cpp
View file

@ -417,10 +417,11 @@ void Board::testRound(const Round &iRound)
{ {
if (isVacant(row, col + i)) if (isVacant(row, col + i))
{ {
Tile t = iRound.getTile(i); const Tile &t = iRound.getTile(i);
if (iRound.isJoker(i)) if (iRound.isJoker(i))
t = Tile(towlower(t.toChar())); m_testsRow[row][col + i] = t.toLower();
m_testsRow[row][col + i] = t; else
m_testsRow[row][col + i] = t;
} }
} }
} }
@ -430,10 +431,11 @@ void Board::testRound(const Round &iRound)
{ {
if (isVacant(row + i, col)) if (isVacant(row + i, col))
{ {
Tile t = iRound.getTile(i); const Tile &t = iRound.getTile(i);
if (iRound.isJoker(i)) if (iRound.isJoker(i))
t = Tile(towlower(t.toChar())); m_testsRow[row + i][col] = t.toLower();
m_testsRow[row + i][col] = t; else
m_testsRow[row + i][col] = t;
} }
} }
} }

2
game/game.cpp
View file

@ -352,7 +352,7 @@ PlayedRack Game::helperSetRackRandom(const PlayedRack &iPld,
if (bestRound.isJoker(i) && bestRound.isPlayedFromRack(i)) if (bestRound.isJoker(i) && bestRound.isPlayedFromRack(i))
{ {
const Tile &jokerTile = bestRound.getTile(i); const Tile &jokerTile = bestRound.getTile(i);
Tile replacingTile(towupper(jokerTile.toChar())); const Tile &replacingTile = jokerTile.toUpper();
LOG_DEBUG("helperSetRackRandom(): replacing Joker with " LOG_DEBUG("helperSetRackRandom(): replacing Joker with "
<< lfw(replacingTile.toChar())); << lfw(replacingTile.toChar()));

3
game/game_move_cmd.cpp
View file

@ -113,8 +113,7 @@ void GameMoveCmd::playRound()
if (m_round.isPlayedFromRack(i) && m_round.isJoker(i)) if (m_round.isPlayedFromRack(i) && m_round.isJoker(i))
{ {
// Is the represented letter still available in the bag? // Is the represented letter still available in the bag?
// XXX: this way to get the represented letter sucks... const Tile &t = m_round.getTile(i).toUpper();
Tile t(towupper(m_round.getTile(i).toChar()));
if (bag.in(t)) if (bag.in(t))
{ {
bag.replaceTile(Tile::Joker()); bag.replaceTile(Tile::Joker());