From: Laurent MAZET <laurent.mazet@thalesgroup.com>
Date: Tue, 18 Jun 2024 12:34:17 +0000 (+0200)
Subject: fix restore function
X-Git-Tag: v1.0~5
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=f44336861e29e8218ae8394dd10005e5556eae0d;p=scrabble.git

fix restore function
---

diff --git a/display.c b/display.c
index 736b86a..5c87acb 100644
--- a/display.c
+++ b/display.c
@@ -200,7 +200,7 @@ void drawwindow (draw_t *game, int score, int xoffset, int yoffset, int mode)
 
     set_color (black);
     for (i = 0; i < game->nbtiles; i++) {
-        if (game->tiles[i] != '\0') {
+        if (game->tiles[i] != ' ') {
             mvaddch (yoffset, xoffset + 2 * i, game->tiles[i]);
         }
     }
diff --git a/function.c b/function.c
index 99e78c7..8f4a9a1 100644
--- a/function.c
+++ b/function.c
@@ -101,6 +101,7 @@ draw_t *newdraw (int nbtiles)
     CHECKALLOC (draw);
     draw->tiles = (char *) calloc (1, nbtiles + 1);
     CHECKALLOC (draw->tiles);
+    memset (draw->tiles, ' ', nbtiles);
     draw->nbtiles = nbtiles;
     return draw;
 }
@@ -126,14 +127,14 @@ draw_t *retrievetiles (draw_t *draw, int nbtiles, draw_t *game, int mode)
     int i;
     if (mode) {
         for (i = 0; i < ret->nbtiles; i++) {
-            if (ret->tiles[i] != '\0') {
+            if (ret->tiles[i] != ' ') {
                 draw->tiles[draw->nbtiles++] = ret->tiles[i];
-                ret->tiles[i] = '\0';
+                ret->tiles[i] = ' ';
             }
         }
     }
     for (i = 0; (i < ret->nbtiles) && (draw->nbtiles > 0); i++) {
-        if (ret->tiles[i] != '\0') {
+        if (ret->tiles[i] != ' ') {
             continue;
         }
         int j = rand () % draw->nbtiles;
@@ -155,7 +156,7 @@ char getnextletter (draw_t *game)
     int i;
     for (i = 0; i < game->nbtiles; i++) {
         game->index = (game->index + 1) % game->nbtiles;
-        if (game->tiles[game->index] != '\0') {
+        if (game->tiles[game->index] != ' ') {
             letter = game->tiles[game->index];
             break;
         }
@@ -166,7 +167,7 @@ char getnextletter (draw_t *game)
 char getnewletter (draw_t *game)
 {
     if (game->index != -1) {
-        game->tiles[game->index] = '\0';
+        game->tiles[game->index] = ' ';
     }
     return getnextletter (game);
 }
@@ -175,7 +176,7 @@ int returnletter (draw_t *game, char letter)
 {
     int i, ret = 0;
     for (i = 0; i < game->nbtiles; i++) {
-        if (game->tiles[i] == '\0') {
+        if (game->tiles[i] == ' ') {
             game->tiles[i] = letter;
             game->index = i - 1;
             ret = 1;