From 7856acc9e37802320266ddef117ab28302613a03 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Mon, 18 Dec 2006 10:06:04 -0800
Subject: [PATCH] rack-fancy: Ignore any blank tiles drawn from the bag

---
 rack-fancy.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rack-fancy.c b/rack-fancy.c
index f1a224f..21c2953 100644
--- a/rack-fancy.c
+++ b/rack-fancy.c
@@ -458,6 +458,7 @@ main (int argc, char *argv[])
     rack_t rack;
     char word[8];
     int i;
+    char *draw;
     GtkWidget *window;
     GooCanvas *canvas;
 
@@ -467,11 +468,14 @@ main (int argc, char *argv[])
     bag_init (&bag);
     bag_shuffle (&bag);
 
-    memcpy (word, bag.tiles, 7);
-    word[7] = '\0';
-
-    for (i = 0; i < 7; i++)
-	word[i] = toupper (word[i]);
+    /* Keep drawing until we get 7 non-blank tiles */
+    i = 0;
+    draw = bag.tiles;
+    while (i < 7) {
+	if (*draw != '?')
+	    word[i++] = toupper (*draw);
+	draw++;
+    }
 
     dict_init (&dict);
     dict_add_words_from_file (&dict, "words.txt");
-- 
2.43.0