X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/4496362fadb5f60b8ecf431fb220d26df7280f99..HEAD:/blackbox.c

diff --git a/blackbox.c b/blackbox.c
index 305feac..1546d91 100644
--- a/blackbox.c
+++ b/blackbox.c
@@ -879,7 +879,7 @@ struct game_drawstate {
     int flash_laserno, isflash;
 };
 
-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 x, int y, int button)
 {
     int gx = -1, gy = -1, rangeno = -1, wouldflash = 0;
@@ -1398,15 +1398,15 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
     if (CAN_REVEAL(state)) {
         int outline = (ui->cur_visible && ui->cur_x == 0 && ui->cur_y == 0)
             ? COL_CURSOR : COL_BALL;
-        clip(dr, TODRAW(0), TODRAW(0), TILE_SIZE-1, TILE_SIZE-1);
+        clip(dr, TODRAW(0)-1, TODRAW(0)-1, TILE_SIZE+1, TILE_SIZE+1);
         draw_circle(dr, TODRAW(0) + ds->crad, TODRAW(0) + ds->crad, ds->crad,
                     outline, outline);
         draw_circle(dr, TODRAW(0) + ds->crad, TODRAW(0) + ds->crad, ds->crad-2,
                     COL_BUTTON, COL_BUTTON);
 	unclip(dr);
     } else {
-        draw_rect(dr, TODRAW(0), TODRAW(0),
-		  TILE_SIZE-1, TILE_SIZE-1, COL_BACKGROUND);
+        draw_rect(dr, TODRAW(0)-1, TODRAW(0)-1,
+		  TILE_SIZE+1, TILE_SIZE+1, COL_BACKGROUND);
     }
     draw_update(dr, TODRAW(0), TODRAW(0), TILE_SIZE, TILE_SIZE);
     ds->reveal = state->reveal;
@@ -1462,13 +1462,21 @@ 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)
 {
-    /*
-     * We return true whenever the solution has been revealed, even
-     * (on spoiler grounds) if it wasn't guessed correctly.
-     */
-    return state->reveal;
+    if (state->reveal) {
+        /*
+         * We return nonzero whenever the solution has been revealed,
+         * even (on spoiler grounds) if it wasn't guessed correctly.
+         */
+        if (state->nwrong == 0 &&
+            state->nmissed == 0 &&
+            state->nright >= state->minballs)
+            return +1;
+        else
+            return -1;
+    }
+    return 0;
 }
 
 static int game_timing_state(game_state *state, game_ui *ui)
@@ -1519,7 +1527,7 @@ const struct game thegame = {
     game_redraw,
     game_anim_length,
     game_flash_length,
-    game_is_solved,
+    game_status,
     FALSE, FALSE, game_print_size, game_print,
     TRUE,			       /* wants_statusbar */
     FALSE, game_timing_state,