Flash on completion. Two people actually complained! :-)

[sgt/puzzles] / rect.c

diff --git a/rect.c b/rect.c
index c145e9b..7992598 100644 (file)
--- a/rect.c
+++ b/rect.c
@@ -76,6 +76,8 @@ struct game_params {
 #define TILE_SIZE 24
 #define BORDER 18
 
+#define FLASH_TIME 0.13F
+
 #define COORD(x) ( (x) * TILE_SIZE + BORDER )
 #define FROMCOORD(x) ( ((x) - BORDER) / TILE_SIZE )
 
@@ -84,6 +86,7 @@ struct game_state {
     int *grid;                        /* contains the numbers */
     unsigned char *vedge;             /* (w+1) x h */
     unsigned char *hedge;             /* w x (h+1) */
+    int completed;
 };
 
 game_params *default_params(void)
@@ -716,6 +719,7 @@ game_state *new_game(game_params *params, char *seed)
     state->grid = snewn(area, int);
     state->vedge = snewn(area, unsigned char);
     state->hedge = snewn(area, unsigned char);
+    state->completed = FALSE;
 
     i = 0;
     while (*seed) {
@@ -756,6 +760,8 @@ game_state *dup_game(game_state *state)
     ret->hedge = snewn(state->w * state->h, unsigned char);
     ret->grid = snewn(state->w * state->h, int);
 
+    ret->completed = state->completed;
+
     memcpy(ret->grid, state->grid, state->w * state->h * sizeof(int));
     memcpy(ret->vedge, state->vedge, state->w*state->h*sizeof(unsigned char));
     memcpy(ret->hedge, state->hedge, state->w*state->h*sizeof(unsigned char));
@@ -917,7 +923,7 @@ int coord_round(float coord)
     /*
      * Find the distance from us to that integer.
      */
-    dist = fabs(coord - (float)i);
+    dist = (float)fabs(coord - (float)i);
 
     /*
      * If we're within the tolerance limit, return the edge
@@ -1032,6 +1038,26 @@ game_state *make_move(game_state *from, game_ui *ui, int x, int y, int button)
                free_game(ret);
                ret = NULL;
            }
+
+            /*
+             * We've made a real change to the grid. Check to see
+             * if the game has been completed.
+             */
+            if (!ret->completed) {
+                int x, y, ok;
+                unsigned char *correct = get_correct(ret);
+
+                ok = TRUE;
+                for (x = 0; x < ret->w; x++)
+                    for (y = 0; y < ret->h; y++)
+                        if (!index(ret, correct, x, y))
+                            ok = FALSE;
+
+                sfree(correct);
+
+                if (ok)
+                    ret->completed = TRUE;
+            }
        }
 
        ui->drag_start_x = -1;
@@ -1136,7 +1162,7 @@ void draw_tile(frontend *fe, game_state *state, int x, int y,
     if (grid(state,x,y)) {
        sprintf(str, "%d", grid(state,x,y));
        draw_text(fe, cx+TILE_SIZE/2, cy+TILE_SIZE/2, FONT_VARIABLE,
-                 TILE_SIZE/3, ALIGN_HCENTRE | ALIGN_VCENTRE, COL_TEXT, str);
+                 TILE_SIZE/2, ALIGN_HCENTRE | ALIGN_VCENTRE, COL_TEXT, str);
     }
 
     /*
@@ -1216,9 +1242,15 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
     }
 
     if (!ds->started) {
+       draw_rect(fe, 0, 0,
+                 state->w * TILE_SIZE + 2*BORDER + 1,
+                 state->h * TILE_SIZE + 2*BORDER + 1, COL_BACKGROUND);
        draw_rect(fe, COORD(0)-1, COORD(0)-1,
                  ds->w*TILE_SIZE+3, ds->h*TILE_SIZE+3, COL_LINE);
        ds->started = TRUE;
+       draw_update(fe, 0, 0,
+                   state->w * TILE_SIZE + 2*BORDER + 1,
+                   state->h * TILE_SIZE + 2*BORDER + 1);
     }
 
     for (x = 0; x < state->w; x++)
@@ -1233,7 +1265,7 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
                c |= index(state,vedge,x,y) << 4;
            if (VRANGE(state,x,y+1))
                c |= index(state,vedge,x,y+1) << 6;
-           if (index(state, correct, x, y))
+           if (index(state, correct, x, y) && !flashtime)
                c |= CORRECT;
 
            if (index(ds,ds->visible,x,y) != c) {
@@ -1257,6 +1289,8 @@ float game_anim_length(game_state *oldstate, game_state *newstate)
 
 float game_flash_length(game_state *oldstate, game_state *newstate)
 {
+    if (!oldstate->completed && newstate->completed)
+        return FLASH_TIME;
     return 0.0F;
 }