markup typo
[sgt/puzzles] / rect.c
diff --git a/rect.c b/rect.c
index e3914b0..abfd332 100644 (file)
--- a/rect.c
+++ b/rect.c
@@ -82,7 +82,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;
+    int completed, cheated;
 };
 
 static game_params *default_params(void)
@@ -386,7 +386,14 @@ static void display_grid(game_params *params, int *grid, int *numbers, int all)
 }
 #endif
 
-static char *new_game_seed(game_params *params, random_state *rs)
+struct game_aux_info {
+    int w, h;
+    unsigned char *vedge;             /* (w+1) x h */
+    unsigned char *hedge;             /* w x (h+1) */
+};
+
+static char *new_game_seed(game_params *params, random_state *rs,
+                          game_aux_info **aux)
 {
     int *grid, *numbers;
     struct rectlist *list;
@@ -828,6 +835,31 @@ static char *new_game_seed(game_params *params, random_state *rs)
     }
 
     /*
+     * Store the rectangle data in the game_aux_info.
+     */
+    {
+       game_aux_info *ai = snew(game_aux_info);
+
+       ai->w = params->w;
+       ai->h = params->h;
+       ai->vedge = snewn(ai->w * ai->h, unsigned char);
+       ai->hedge = snewn(ai->w * ai->h, unsigned char);
+
+       for (y = 0; y < params->h; y++)
+           for (x = 1; x < params->w; x++) {
+               vedge(ai, x, y) =
+                   index(params, grid, x, y) != index(params, grid, x-1, y);
+           }
+       for (y = 1; y < params->h; y++)
+           for (x = 0; x < params->w; x++) {
+               hedge(ai, x, y) =
+                   index(params, grid, x, y) != index(params, grid, x, y-1);
+           }
+
+       *aux = ai;
+    }
+
+    /*
      * Place numbers.
      */
     numbers = snewn(params->w * params->h, int);
@@ -898,6 +930,13 @@ static char *new_game_seed(game_params *params, random_state *rs)
     return seed;
 }
 
+static void game_free_aux_info(game_aux_info *ai)
+{
+    sfree(ai->vedge);
+    sfree(ai->hedge);
+    sfree(ai);
+}
+
 static char *validate_seed(game_params *params, char *seed)
 {
     int area = params->w * params->h;
@@ -939,7 +978,7 @@ static 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;
+    state->completed = state->cheated = FALSE;
 
     i = 0;
     while (*seed) {
@@ -981,6 +1020,7 @@ static game_state *dup_game(game_state *state)
     ret->grid = snewn(state->w * state->h, int);
 
     ret->completed = state->completed;
+    ret->cheated = state->cheated;
 
     memcpy(ret->grid, state->grid, state->w * state->h * sizeof(int));
     memcpy(ret->vedge, state->vedge, state->w*state->h*sizeof(unsigned char));
@@ -997,6 +1037,120 @@ static void free_game(game_state *state)
     sfree(state);
 }
 
+static game_state *solve_game(game_state *state, game_aux_info *ai,
+                             char **error)
+{
+    game_state *ret;
+
+    if (!ai) {
+       *error = "Solution not known for this puzzle";
+       return NULL;
+    }
+
+    assert(state->w == ai->w);
+    assert(state->h == ai->h);
+
+    ret = dup_game(state);
+    memcpy(ret->vedge, ai->vedge, ai->w * ai->h * sizeof(unsigned char));
+    memcpy(ret->hedge, ai->hedge, ai->w * ai->h * sizeof(unsigned char));
+    ret->cheated = TRUE;
+
+    return ret;
+}
+
+static char *game_text_format(game_state *state)
+{
+    char *ret, *p, buf[80];
+    int i, x, y, col, maxlen;
+
+    /*
+     * First determine the number of spaces required to display a
+     * number. We'll use at least two, because one looks a bit
+     * silly.
+     */
+    col = 2;
+    for (i = 0; i < state->w * state->h; i++) {
+       x = sprintf(buf, "%d", state->grid[i]);
+       if (col < x) col = x;
+    }
+
+    /*
+     * Now we know the exact total size of the grid we're going to
+     * produce: it's got 2*h+1 rows, each containing w lots of col,
+     * w+1 boundary characters and a trailing newline.
+     */
+    maxlen = (2*state->h+1) * (state->w * (col+1) + 2);
+
+    ret = snewn(maxlen, char);
+    p = ret;
+
+    for (y = 0; y <= 2*state->h; y++) {
+       for (x = 0; x <= 2*state->w; x++) {
+           if (x & y & 1) {
+               /*
+                * Display a number.
+                */
+               int v = grid(state, x/2, y/2);
+               if (v)
+                   sprintf(buf, "%*d", col, v);
+               else
+                   sprintf(buf, "%*s", col, "");
+               memcpy(p, buf, col);
+               p += col;
+           } else if (x & 1) {
+               /*
+                * Display a horizontal edge or nothing.
+                */
+               int h = (y==0 || y==2*state->h ? 1 :
+                        HRANGE(state, x/2, y/2) && hedge(state, x/2, y/2));
+               int i;
+               if (h)
+                   h = '-';
+               else
+                   h = ' ';
+               for (i = 0; i < col; i++)
+                   *p++ = h;
+           } else if (y & 1) {
+               /*
+                * Display a vertical edge or nothing.
+                */
+               int v = (x==0 || x==2*state->w ? 1 :
+                        VRANGE(state, x/2, y/2) && vedge(state, x/2, y/2));
+               if (v)
+                   *p++ = '|';
+               else
+                   *p++ = ' ';
+           } else {
+               /*
+                * Display a corner, or a vertical edge, or a
+                * horizontal edge, or nothing.
+                */
+               int hl = (y==0 || y==2*state->h ? 1 :
+                         HRANGE(state, (x-1)/2, y/2) && hedge(state, (x-1)/2, y/2));
+               int hr = (y==0 || y==2*state->h ? 1 :
+                         HRANGE(state, (x+1)/2, y/2) && hedge(state, (x+1)/2, y/2));
+               int vu = (x==0 || x==2*state->w ? 1 :
+                         VRANGE(state, x/2, (y-1)/2) && vedge(state, x/2, (y-1)/2));
+               int vd = (x==0 || x==2*state->w ? 1 :
+                         VRANGE(state, x/2, (y+1)/2) && vedge(state, x/2, (y+1)/2));
+               if (!hl && !hr && !vu && !vd)
+                   *p++ = ' ';
+               else if (hl && hr && !vu && !vd)
+                   *p++ = '-';
+               else if (!hl && !hr && vu && vd)
+                   *p++ = '|';
+               else
+                   *p++ = '+';
+           }
+       }
+       *p++ = '\n';
+    }
+
+    assert(p - ret == maxlen);
+    *p = '\0';
+    return ret;
+}
+
 static unsigned char *get_correct(game_state *state)
 {
     unsigned char *ret;
@@ -1585,7 +1739,8 @@ static float game_anim_length(game_state *oldstate,
 static float game_flash_length(game_state *oldstate,
                               game_state *newstate, int dir)
 {
-    if (!oldstate->completed && newstate->completed)
+    if (!oldstate->completed && newstate->completed &&
+       !oldstate->cheated && !newstate->cheated)
         return FLASH_TIME;
     return 0.0F;
 }
@@ -1600,21 +1755,23 @@ static int game_wants_statusbar(void)
 #endif
 
 const struct game thegame = {
-    "Rectangles", "games.rectangles", TRUE,
+    "Rectangles", "games.rectangles",
     default_params,
     game_fetch_preset,
     decode_params,
     encode_params,
     free_params,
     dup_params,
-    game_configure,
-    custom_params,
+    TRUE, game_configure, custom_params,
     validate_params,
     new_game_seed,
+    game_free_aux_info,
     validate_seed,
     new_game,
     dup_game,
     free_game,
+    TRUE, solve_game,
+    TRUE, game_text_format,
     new_ui,
     free_ui,
     make_move,