From: Simon Tatham <anakin@pobox.com>
Date: Sun, 18 Sep 2011 07:43:18 +0000 (+0000)
Subject: When we run out of background colours for chains and wrap back to the
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=295fb9fd83512432404cd701c8b09bae4e627e20;p=sgt-puzzles.git

When we run out of background colours for chains and wrap back to the
beginning, we should wrap back to COL_B0+1 rather than COL_B0 itself,
so as not to reuse white. White should be special, and always indicate
a properly numbered square.

[originally from svn r9305]
---

diff --git a/signpost.c b/signpost.c
index 6b16ff7..19649b2 100644
--- a/signpost.c
+++ b/signpost.c
@@ -1812,8 +1812,8 @@ static int num2col(game_drawstate *ds, int num)
 {
     int set = num / (ds->n+1);
 
-    if (num <= 0) return COL_B0;
-    return COL_B0 + (set % 16);
+    if (num <= 0 || set == 0) return COL_B0;
+    return COL_B0 + 1 + ((set-1) % 15);
 }
 
 #define ARROW_HALFSZ (7 * TILE_SIZE / 32)