X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/72c158219fd9dbf19a01f2bf62303627a5e414e4..HEAD:/unequal.c

diff --git a/unequal.c b/unequal.c
index 1c272da..d16a572 100644
--- a/unequal.c
+++ b/unequal.c
@@ -1371,7 +1371,7 @@ struct game_drawstate {
     int hflash;
 };
 
-static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
+static char *interpret_move(game_state *state, game_ui *ui, const game_drawstate *ds,
 			    int ox, int oy, int button)
 {
     int x = FROMCOORD(ox), y = FROMCOORD(oy), n;
@@ -1620,40 +1620,40 @@ static void draw_gt(drawing *dr, int ox, int oy,
 }
 
 static void draw_gts(drawing *dr, game_drawstate *ds, int ox, int oy,
-                     unsigned int f, int col)
+                     unsigned int f, int bg, int fg)
 {
     int g = GAP_SIZE, g2 = (g+1)/2, g4 = (g+1)/4;
 
     /* Draw all the greater-than signs emanating from this tile. */
 
     if (f & F_ADJ_UP) {
-	draw_rect(dr, ox, oy - g, TILE_SIZE, g, COL_BACKGROUND);
+	if (bg >= 0) draw_rect(dr, ox, oy - g, TILE_SIZE, g, bg);
         draw_gt(dr, ox+g2, oy-g4, g2, -g2, g2, g2,
-               (f & F_ERROR_UP) ? COL_ERROR : col);
+               (f & F_ERROR_UP) ? COL_ERROR : fg);
         draw_update(dr, ox, oy-g, TILE_SIZE, g);
     }
     if (f & F_ADJ_RIGHT) {
-	draw_rect(dr, ox + TILE_SIZE, oy, g, TILE_SIZE, COL_BACKGROUND);
+	if (bg >= 0) draw_rect(dr, ox + TILE_SIZE, oy, g, TILE_SIZE, bg);
         draw_gt(dr, ox+TILE_SIZE+g4, oy+g2, g2, g2, -g2, g2,
-                (f & F_ERROR_RIGHT) ? COL_ERROR : col);
+                (f & F_ERROR_RIGHT) ? COL_ERROR : fg);
         draw_update(dr, ox+TILE_SIZE, oy, g, TILE_SIZE);
     }
     if (f & F_ADJ_DOWN) {
-	draw_rect(dr, ox, oy + TILE_SIZE, TILE_SIZE, g, COL_BACKGROUND);
+	if (bg >= 0) draw_rect(dr, ox, oy + TILE_SIZE, TILE_SIZE, g, bg);
         draw_gt(dr, ox+g2, oy+TILE_SIZE+g4, g2, g2, g2, -g2,
-               (f & F_ERROR_DOWN) ? COL_ERROR : col);
+               (f & F_ERROR_DOWN) ? COL_ERROR : fg);
         draw_update(dr, ox, oy+TILE_SIZE, TILE_SIZE, g);
     }
     if (f & F_ADJ_LEFT) {
-	draw_rect(dr, ox - g, oy, g, TILE_SIZE, COL_BACKGROUND);
+	if (bg >= 0) draw_rect(dr, ox - g, oy, g, TILE_SIZE, bg);
         draw_gt(dr, ox-g4, oy+g2, -g2, g2, g2, g2,
-                (f & F_ERROR_LEFT) ? COL_ERROR : col);
+                (f & F_ERROR_LEFT) ? COL_ERROR : fg);
         draw_update(dr, ox-g, oy, g, TILE_SIZE);
     }
 }
 
 static void draw_adjs(drawing *dr, game_drawstate *ds, int ox, int oy,
-                     unsigned int f, int col)
+                      unsigned int f, int bg, int fg)
 {
     int g = GAP_SIZE, g38 = 3*(g+1)/8, g4 = (g+1)/4;
 
@@ -1667,24 +1667,24 @@ static void draw_adjs(drawing *dr, game_drawstate *ds, int ox, int oy,
     if (f & (F_ADJ_RIGHT|F_ERROR_RIGHT)) {
         if (f & F_ADJ_RIGHT) {
             draw_rect(dr, ox+TILE_SIZE+g38, oy, g4, TILE_SIZE,
-                      (f & F_ERROR_RIGHT) ? COL_ERROR : col);
+                      (f & F_ERROR_RIGHT) ? COL_ERROR : fg);
         } else {
             draw_rect_outline(dr, ox+TILE_SIZE+g38, oy, g4, TILE_SIZE, COL_ERROR);
         }
-    } else {
-        draw_rect(dr, ox+TILE_SIZE+g38, oy, g4, TILE_SIZE, COL_BACKGROUND);
+    } else if (bg >= 0) {
+        draw_rect(dr, ox+TILE_SIZE+g38, oy, g4, TILE_SIZE, bg);
     }
     draw_update(dr, ox+TILE_SIZE, oy, g, TILE_SIZE);
 
     if (f & (F_ADJ_DOWN|F_ERROR_DOWN)) {
         if (f & F_ADJ_DOWN) {
             draw_rect(dr, ox, oy+TILE_SIZE+g38, TILE_SIZE, g4,
-                      (f & F_ERROR_DOWN) ? COL_ERROR : col);
+                      (f & F_ERROR_DOWN) ? COL_ERROR : fg);
         } else {
             draw_rect_outline(dr, ox, oy+TILE_SIZE+g38, TILE_SIZE, g4, COL_ERROR);
         }
-    } else {
-        draw_rect(dr, ox, oy+TILE_SIZE+g38, TILE_SIZE, g4, COL_BACKGROUND);
+    } else if (bg >= 0) {
+        draw_rect(dr, ox, oy+TILE_SIZE+g38, TILE_SIZE, g4, bg);
     }
     draw_update(dr, ox, oy+TILE_SIZE, TILE_SIZE, g);
 }
@@ -1722,9 +1722,9 @@ static void draw_furniture(drawing *dr, game_drawstate *ds, game_state *state,
 
     /* Draw the adjacent clue signs. */
     if (ds->adjacent)
-        draw_adjs(dr, ds, ox, oy, f, COL_GRID);
+        draw_adjs(dr, ds, ox, oy, f, COL_BACKGROUND, COL_GRID);
     else
-        draw_gts(dr, ds, ox, oy, f, COL_TEXT);
+        draw_gts(dr, ds, ox, oy, f, COL_BACKGROUND, COL_TEXT);
 }
 
 static void draw_num(drawing *dr, game_drawstate *ds, int x, int y)
@@ -1865,9 +1865,9 @@ static float game_flash_length(game_state *oldstate, game_state *newstate,
     return 0.0F;
 }
 
-static int game_is_solved(game_state *state)
+static int game_status(game_state *state)
 {
-    return state->completed;
+    return state->completed ? +1 : 0;
 }
 
 static int game_timing_state(game_state *state, game_ui *ui)
@@ -1912,9 +1912,9 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
                       ink, str);
 
             if (state->adjacent)
-                draw_adjs(dr, ds, ox, oy, GRID(state, flags, x, y), ink);
+                draw_adjs(dr, ds, ox, oy, GRID(state, flags, x, y), -1, ink);
             else
-                draw_gts(dr, ds, ox, oy, GRID(state, flags, x, y), ink);
+                draw_gts(dr, ds, ox, oy, GRID(state, flags, x, y), -1, ink);
         }
     }
 }
@@ -1958,7 +1958,7 @@ const struct game thegame = {
     game_redraw,
     game_anim_length,
     game_flash_length,
-    game_is_solved,
+    game_status,
     TRUE, FALSE, game_print_size, game_print,
     FALSE,			       /* wants_statusbar */
     FALSE, game_timing_state,