Revise the printing colour framework so that we can explicitly
[sgt/puzzles] / solo.c
diff --git a/solo.c b/solo.c
index e9f1804..7b168e5 100644 (file)
--- a/solo.c
+++ b/solo.c
@@ -2571,6 +2571,8 @@ static char *validate_desc(game_params *params, char *desc)
         return "Too much data to fit in grid";
 
     if (params->r == 1) {
+       int pos;
+
        /*
         * Now we expect a suffix giving the jigsaw block
         * structure. Parse it and validate that it divides the
@@ -2579,7 +2581,7 @@ static char *validate_desc(game_params *params, char *desc)
         */
        if (*desc != ',')
            return "Expected jigsaw block structure in game description";
-       int pos = 0;
+       pos = 0;
 
        dsf = snew_dsf(area);
        desc++;
@@ -3717,7 +3719,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
      */
     if (state->xtype) {
        int i;
-       int xhighlight = print_grey_colour(dr, HATCH_SLASH, 0.90F);
+       int xhighlight = print_grey_colour(dr, 0.90F);
 
        for (i = 0; i < cr; i++)
            draw_rect(dr, BORDER + i*TILE_SIZE, BORDER + i*TILE_SIZE,