Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-29 20:34:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed loading of games, for languages with multichar letters like Catalan

Browse source
This commit is contained in:
Olivier Teulière 2010-03-06 16:53:37 +00:00
parent 7dcd9898ed
commit 5642bfa191
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
game/xml_reader.cpp
View file

@ -112,10 +112,10 @@ static Move buildMove(const Game &iGame, map<string, string> &attr,
string type = attr["type"];
if (type == "valid")
{
wstring word = iGame.getDic().convertFromInput(fromUtf8(attr["word"]));
Round round;
int res = iGame.checkPlayedWord(fromUtf8(attr["coord"]),
fromUtf8(attr["word"]),
round, checkRack);
word, round, checkRack);
if (res != 0)
{
throw LoadGameException("Invalid move marked as valid: " +
@ -269,12 +269,13 @@ void XmlReader::endElement(const string& namespaceURI,
else if (tag == "PlayerRack")
{
// Build a rack for the correct player
const wstring &rackStr = m_dic.convertFromInput(fromUtf8(m_data));
PlayedRack pldrack;
if (!m_dic.validateLetters(fromUtf8(m_data), L"-+"))
if (!m_dic.validateLetters(rackStr, L"-+"))
{
throw LoadGameException("Rack invalid for the current dictionary: " + m_data);
}
pldrack.setManual(fromUtf8(m_data));
pldrack.setManual(rackStr);
#if 0
cerr << "loaded rack: " << convertToMb(pldrack.toString()) << endl;
#endif