[Eliot-dev] eliot/game bag.cpp board.cpp board_cross.cpp ga... [cppdic]

[eliot-dev]

CVSROOT:        /sources/eliot
Module name:    eliot
Branch:         cppdic
Changes by:     Olivier Teulière <ipkiss>      06/12/23 13:51:13

Modified files:
        game           : bag.cpp board.cpp board_cross.cpp game.cpp 

Log message:
        Fixed a few char/wchar_t issues. The remaining ones need a 
wchar_t-aware diction
        ary (backport from Head)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/game/bag.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.7&r2=1.7.2.1
http://cvs.savannah.gnu.org/viewcvs/eliot/game/board.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.14.2.1&r2=1.14.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/game/board_cross.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.31.2.1&r2=1.31.2.2

Patches:
Index: bag.cpp
===================================================================
RCS file: /sources/eliot/eliot/game/bag.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- bag.cpp     22 Jan 2006 12:23:53 -0000      1.7
+++ bag.cpp     23 Dec 2006 13:51:13 -0000      1.7.2.1
@@ -132,7 +132,7 @@
     for (it = m_tilesMap.begin(); it != m_tilesMap.end(); it++)
     {
         if (it->second)
-            fprintf(stderr, "%c[%i] ", it->first.toChar(), it->second);
+            fprintf(stderr, "%lc[%i] ", it->first.toChar(), it->second);
     }
     fprintf(stderr, "\n");
 }

Index: board.cpp
===================================================================
RCS file: /sources/eliot/eliot/game/board.cpp,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- board.cpp   5 Nov 2006 17:27:03 -0000       1.14.2.1
+++ board.cpp   23 Dec 2006 13:51:13 -0000      1.14.2.2
@@ -272,16 +272,16 @@
             /* There is already a letter on the board */
             if (iTilesMx[row][col + i] != t)
             {
-                /* check if it is only a joker */
+                /* Check if it is only a joker */
                 if ((iTilesMx[row][col+i].toCode() == t.toCode()) && 
iTilesMx[row][col+i].isJoker())
                 {
-                    // do nothing, we don't need to change the tile in the 
round
+                    // Do nothing, we don't need to change the tile in the 
round
                     // iRound.setJoker(i,true);
-                    debug("load: play on joker for letter %d 
(%c)\n",i,iRound.getTile(i).toChar());
+                    debug("load: play on joker for letter %d (%lc)\n", i, 
iRound.getTile(i).toChar());
                 }
                 else
                 {
-                    debug("load: overwriting tile %c with %c\n",
+                    debug("load: overwriting tile %lc with %lc\n",
                           iTilesMx[row][col+i].toChar(),
                           t.toChar());
                     return 2;

Index: board_cross.cpp
===================================================================
RCS file: /sources/eliot/eliot/game/board_cross.cpp,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3

Index: game.cpp
===================================================================
RCS file: /sources/eliot/eliot/game/game.cpp,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -b -r1.31.2.1 -r1.31.2.2
--- game.cpp    15 Oct 2006 11:07:55 -0000      1.31.2.1
+++ game.cpp    23 Dec 2006 13:51:13 -0000      1.31.2.2
@@ -92,7 +92,7 @@
             {
                 // Is the represented letter still available in the bag?
                 // FIXME: this way to get the represented letter sucks...
-                Tile t(toupper(iRound.getTile(i).toChar()));
+                Tile t(towupper(iRound.getTile(i).toChar()));
                 Bag bag;
                 realBag(bag);
                 // FIXME: realBag() does not give us a real bag in this