X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/b443c3812325e91d84887ba4b873bccdae7d587e..4b24f58222c549b383d23ed86a958c9656218c48:/sixteen.c diff --git a/sixteen.c b/sixteen.c index 1b0b4ea..950f724 100644 --- a/sixteen.c +++ b/sixteen.c @@ -8,13 +8,11 @@ #include #include #include +#include #include #include "puzzles.h" -const char *const game_name = "Sixteen"; -const int game_can_configure = TRUE; - #define TILE_SIZE 48 #define BORDER TILE_SIZE /* big border to fill with arrows */ #define HIGHLIGHT_WIDTH (TILE_SIZE / 20) @@ -44,11 +42,13 @@ struct game_state { int w, h, n; int *tiles; int completed; + int just_used_solve; /* used to suppress undo animation */ + int used_solve; /* used to suppress completion flash */ int movecount; int last_movement_sense; }; -game_params *default_params(void) +static game_params *default_params(void) { game_params *ret = snew(game_params); @@ -57,7 +57,7 @@ game_params *default_params(void) return ret; } -int game_fetch_preset(int i, char **name, game_params **params) +static int game_fetch_preset(int i, char **name, game_params **params) { game_params *ret; int w, h; @@ -80,19 +80,42 @@ int game_fetch_preset(int i, char **name, game_params **params) return TRUE; } -void free_params(game_params *params) +static void free_params(game_params *params) { sfree(params); } -game_params *dup_params(game_params *params) +static game_params *dup_params(game_params *params) { game_params *ret = snew(game_params); *ret = *params; /* structure copy */ return ret; } -config_item *game_configure(game_params *params) +static game_params *decode_params(char const *string) +{ + game_params *ret = default_params(); + + ret->w = ret->h = atoi(string); + while (*string && isdigit(*string)) string++; + if (*string == 'x') { + string++; + ret->h = atoi(string); + } + + return ret; +} + +static char *encode_params(game_params *params) +{ + char data[256]; + + sprintf(data, "%dx%d", params->w, params->h); + + return dupstr(data); +} + +static config_item *game_configure(game_params *params) { config_item *ret; char buf[80]; @@ -119,7 +142,7 @@ config_item *game_configure(game_params *params) return ret; } -game_params *custom_params(config_item *cfg) +static game_params *custom_params(config_item *cfg) { game_params *ret = snew(game_params); @@ -129,7 +152,7 @@ game_params *custom_params(config_item *cfg) return ret; } -char *validate_params(game_params *params) +static char *validate_params(game_params *params) { if (params->w < 2 && params->h < 2) return "Width and height must both be at least two"; @@ -137,7 +160,7 @@ char *validate_params(game_params *params) return NULL; } -int perm_parity(int *perm, int n) +static int perm_parity(int *perm, int n) { int i, j, ret; @@ -151,7 +174,8 @@ int perm_parity(int *perm, int n) return ret; } -char *new_game_seed(game_params *params, random_state *rs) +static char *new_game_seed(game_params *params, random_state *rs, + game_aux_info **aux) { int stop, n, i, x; int x1, x2, p1, p2; @@ -257,8 +281,13 @@ char *new_game_seed(game_params *params, random_state *rs) return ret; } +static void game_free_aux_info(game_aux_info *aux) +{ + assert(!"Shouldn't happen"); +} + -char *validate_seed(game_params *params, char *seed) +static char *validate_seed(game_params *params, char *seed) { char *p, *err; int i, area; @@ -309,7 +338,7 @@ char *validate_seed(game_params *params, char *seed) return err; } -game_state *new_game(game_params *params, char *seed) +static game_state *new_game(game_params *params, char *seed) { game_state *state = snew(game_state); int i; @@ -332,12 +361,13 @@ game_state *new_game(game_params *params, char *seed) assert(!*p); state->completed = state->movecount = 0; + state->used_solve = state->just_used_solve = FALSE; state->last_movement_sense = 0; return state; } -game_state *dup_game(game_state *state) +static game_state *dup_game(game_state *state) { game_state *ret = snew(game_state); @@ -348,23 +378,95 @@ game_state *dup_game(game_state *state) memcpy(ret->tiles, state->tiles, state->w * state->h * sizeof(int)); ret->completed = state->completed; ret->movecount = state->movecount; + ret->used_solve = state->used_solve; + ret->just_used_solve = state->just_used_solve; ret->last_movement_sense = state->last_movement_sense; return ret; } -void free_game(game_state *state) +static void free_game(game_state *state) { sfree(state); } -game_state *make_move(game_state *from, int x, int y, int button) +static game_state *solve_game(game_state *state, game_aux_info *aux, + char **error) +{ + game_state *ret = dup_game(state); + int i; + + /* + * Simply replace the grid with a solved one. For this game, + * this isn't a useful operation for actually telling the user + * what they should have done, but it is useful for + * conveniently being able to get hold of a clean state from + * which to practise manoeuvres. + */ + for (i = 0; i < ret->n; i++) + ret->tiles[i] = i+1; + ret->used_solve = ret->just_used_solve = TRUE; + ret->completed = ret->movecount; + + return ret; +} + +static char *game_text_format(game_state *state) +{ + char *ret, *p, buf[80]; + int x, y, col, maxlen; + + /* + * First work out how many characters we need to display each + * number. + */ + col = sprintf(buf, "%d", state->n); + + /* + * Now we know the exact total size of the grid we're going to + * produce: it's got h rows, each containing w lots of col, w-1 + * spaces and a trailing newline. + */ + maxlen = state->h * state->w * (col+1); + + ret = snewn(maxlen+1, char); + p = ret; + + for (y = 0; y < state->h; y++) { + for (x = 0; x < state->w; x++) { + int v = state->tiles[state->w*y+x]; + sprintf(buf, "%*d", col, v); + memcpy(p, buf, col); + p += col; + if (x+1 == state->w) + *p++ = '\n'; + else + *p++ = ' '; + } + } + + assert(p - ret == maxlen); + *p = '\0'; + return ret; +} + +static game_ui *new_ui(game_state *state) +{ + return NULL; +} + +static void free_ui(game_ui *ui) +{ +} + +static game_state *make_move(game_state *from, game_ui *ui, + int x, int y, int button) { int cx, cy; int dx, dy, tx, ty, n; game_state *ret; - if (button != LEFT_BUTTON) + if (button != LEFT_BUTTON && button != RIGHT_BUTTON) return NULL; cx = FROMCOORD(x); @@ -380,7 +482,15 @@ game_state *make_move(game_state *from, int x, int y, int button) else return NULL; /* invalid click location */ + /* reverse direction if right hand button is pressed */ + if (button == RIGHT_BUTTON) + { + dx = -dx; if (dx) cx = from->w - 1 - cx; + dy = -dy; if (dy) cy = from->h - 1 - cy; + } + ret = dup_game(from); + ret->just_used_solve = FALSE; /* zero this in a hurry */ do { cx += dx; @@ -417,13 +527,13 @@ struct game_drawstate { int *tiles; }; -void game_size(game_params *params, int *x, int *y) +static void game_size(game_params *params, int *x, int *y) { *x = TILE_SIZE * params->w + 2 * BORDER; *y = TILE_SIZE * params->h + 2 * BORDER; } -float *game_colours(frontend *fe, game_state *state, int *ncolours) +static float *game_colours(frontend *fe, game_state *state, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); int i; @@ -454,7 +564,7 @@ float *game_colours(frontend *fe, game_state *state, int *ncolours) return ret; } -game_drawstate *game_new_drawstate(game_state *state) +static game_drawstate *game_new_drawstate(game_state *state) { struct game_drawstate *ds = snew(struct game_drawstate); int i; @@ -470,7 +580,7 @@ game_drawstate *game_new_drawstate(game_state *state) return ds; } -void game_free_drawstate(game_drawstate *ds) +static void game_free_drawstate(game_drawstate *ds) { sfree(ds->tiles); sfree(ds); @@ -533,8 +643,9 @@ static void draw_arrow(frontend *fe, int x, int y, int xdx, int xdy) draw_polygon(fe, coords, 7, FALSE, COL_TEXT); } -void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, - game_state *state, float animtime, float flashtime) +static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, + game_state *state, int dir, game_ui *ui, + float animtime, float flashtime) { int i, bgcolour; @@ -622,10 +733,12 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, float c; int sense; - if (oldstate && state->movecount < oldstate->movecount) + if (dir < 0) { + assert(oldstate); sense = -oldstate->last_movement_sense; - else + } else { sense = state->last_movement_sense; + } t = state->tiles[i]; @@ -700,28 +813,74 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, if (oldstate) state = oldstate; - sprintf(statusbuf, "%sMoves: %d", - (state->completed ? "COMPLETED! " : ""), - (state->completed ? state->completed : state->movecount)); + if (state->used_solve) + sprintf(statusbuf, "Moves since auto-solve: %d", + state->movecount - state->completed); + else + sprintf(statusbuf, "%sMoves: %d", + (state->completed ? "COMPLETED! " : ""), + (state->completed ? state->completed : state->movecount)); status_bar(fe, statusbuf); } } -float game_anim_length(game_state *oldstate, game_state *newstate) +static float game_anim_length(game_state *oldstate, + game_state *newstate, int dir) { - return ANIM_TIME; + if ((dir > 0 && newstate->just_used_solve) || + (dir < 0 && oldstate->just_used_solve)) + return 0.0F; + else + return ANIM_TIME; } -float game_flash_length(game_state *oldstate, game_state *newstate) +static float game_flash_length(game_state *oldstate, + game_state *newstate, int dir) { - if (!oldstate->completed && newstate->completed) + if (!oldstate->completed && newstate->completed && + !oldstate->used_solve && !newstate->used_solve) return 2 * FLASH_FRAME; else return 0.0F; } -int game_wants_statusbar(void) +static int game_wants_statusbar(void) { return TRUE; } + +#ifdef COMBINED +#define thegame sixteen +#endif + +const struct game thegame = { + "Sixteen", "games.sixteen", + default_params, + game_fetch_preset, + decode_params, + encode_params, + free_params, + dup_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, + game_size, + game_colours, + game_new_drawstate, + game_free_drawstate, + game_redraw, + game_anim_length, + game_flash_length, + game_wants_statusbar, +};