X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/818752113d2ba0ab8661365c5e81665e8fc6d15f..b2a646f1af7858878025bdae14bef9482bee8e26:/sixteen.c?ds=sidebyside diff --git a/sixteen.c b/sixteen.c index 2751be4..c202de1 100644 --- a/sixteen.c +++ b/sixteen.c @@ -95,11 +95,10 @@ static game_params *dup_params(game_params *params) return ret; } -static game_params *decode_params(char const *string) +static void decode_params(game_params *ret, char const *string) { - game_params *ret = default_params(); - ret->w = ret->h = atoi(string); + ret->movetarget = 0; while (*string && isdigit(*string)) string++; if (*string == 'x') { string++; @@ -113,15 +112,17 @@ static game_params *decode_params(char const *string) while (*string && isdigit((unsigned char)*string)) string++; } - - return ret; } -static char *encode_params(game_params *params) +static char *encode_params(game_params *params, int full) { char data[256]; sprintf(data, "%dx%d", params->w, params->h); + /* Shuffle limit is part of the limited parameters, because we have to + * supply the target move count. */ + if (params->movetarget) + sprintf(data + strlen(data), "m%d", params->movetarget); return dupstr(data); } @@ -192,8 +193,8 @@ static int perm_parity(int *perm, int n) return ret; } -static char *new_game_seed(game_params *params, random_state *rs, - game_aux_info **aux) +static char *new_game_desc(game_params *params, random_state *rs, + game_aux_info **aux, int interactive) { int stop, n, i, x; int x1, x2, p1, p2; @@ -206,7 +207,9 @@ static char *new_game_seed(game_params *params, random_state *rs, tiles = snewn(n, int); if (params->movetarget) { - int prevstart = -1, prevoffset = -1, prevdirection = 0, nrepeats = 0; + int prevoffset = -1; + int max = (params->w > params->h ? params->w : params->h); + int *prevmoves = snewn(max, int); /* * Shuffle the old-fashioned way, by making a series of @@ -217,7 +220,7 @@ static char *new_game_seed(game_params *params, random_state *rs, tiles[i] = i; for (i = 0; i < params->movetarget; i++) { - int start, offset, len, direction; + int start, offset, len, direction, index; int j, tmp; /* @@ -229,12 +232,14 @@ static char *new_game_seed(game_params *params, random_state *rs, if (j < params->w) { /* Column. */ + index = j; start = j; offset = params->w; len = params->h; } else { /* Row. */ - start = (j - params->w) * params->w; + index = j - params->w; + start = index * params->w; offset = 1; len = params->w; } @@ -242,36 +247,42 @@ static char *new_game_seed(game_params *params, random_state *rs, direction = -1 + 2 * random_upto(rs, 2); /* - * To at least _try_ to avoid boring cases, check that - * this move doesn't directly undo the previous one, or - * repeat it so many times as to turn it into fewer - * moves. + * To at least _try_ to avoid boring cases, check + * that this move doesn't directly undo a previous + * one, or repeat it so many times as to turn it + * into fewer moves in the opposite direction. (For + * example, in a row of length 4, we're allowed to + * move it the same way twice, but not three + * times.) + * + * We track this for each individual row/column, + * and clear all the counters as soon as a + * perpendicular move is made. This isn't perfect + * (it _can't_ guaranteeably be perfect - there + * will always come a move count beyond which a + * shorter solution will be possible than the one + * which constructed the position) but it should + * sort out all the obvious cases. */ - if (start == prevstart && offset == prevoffset) { - if (direction == -prevdirection) - continue; /* inverse of previous move */ - else if (2 * (nrepeats+1) > len) - continue; /* previous move repeated too often */ - } + if (offset == prevoffset) { + tmp = prevmoves[index] + direction; + if (abs(2*tmp) > len || abs(tmp) < abs(prevmoves[index])) + continue; + } /* If we didn't `continue', we've found an OK move to make. */ + if (offset != prevoffset) { + int i; + for (i = 0; i < max; i++) + prevmoves[i] = 0; + prevoffset = offset; + } + prevmoves[index] += direction; break; } /* - * Now save the move into the `prev' variables. - */ - if (start == prevstart && offset == prevoffset) { - nrepeats++; - } else { - prevstart = start; - prevoffset = offset; - prevdirection = direction; - nrepeats = 1; - } - - /* - * And make it. + * Make the move. */ if (direction < 0) { start += (len-1) * offset; @@ -283,6 +294,8 @@ static char *new_game_seed(game_params *params, random_state *rs, tiles[start + (len-1) * offset] = tmp; } + sfree(prevmoves); + } else { used = snewn(n, int); @@ -362,8 +375,8 @@ static char *new_game_seed(game_params *params, random_state *rs, } /* - * Now construct the game seed, by describing the tile array as - * a simple sequence of comma-separated integers. + * Now construct the game description, by describing the tile + * array as a simple sequence of comma-separated integers. */ ret = NULL; retlen = 0; @@ -390,14 +403,14 @@ static void game_free_aux_info(game_aux_info *aux) } -static char *validate_seed(game_params *params, char *seed) +static char *validate_desc(game_params *params, char *desc) { char *p, *err; int i, area; int *used; area = params->w * params->h; - p = seed; + p = desc; err = NULL; used = snewn(area, int); @@ -441,7 +454,7 @@ static char *validate_seed(game_params *params, char *seed) return err; } -static game_state *new_game(game_params *params, char *seed) +static game_state *new_game(midend_data *me, game_params *params, char *desc) { game_state *state = snew(game_state); int i; @@ -452,7 +465,7 @@ static game_state *new_game(game_params *params, char *seed) state->n = params->w * params->h; state->tiles = snewn(state->n, int); - p = seed; + p = desc; i = 0; for (i = 0; i < state->n; i++) { assert(*p); @@ -564,13 +577,13 @@ static void free_ui(game_ui *ui) { } -static game_state *make_move(game_state *from, game_ui *ui, - int x, int y, int button) -{ +static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, + int x, int y, int button) { int cx, cy; int dx, dy, tx, ty, n; game_state *ret; + button &= ~MOD_MASK; if (button != LEFT_BUTTON && button != RIGHT_BUTTON) return NULL; @@ -935,7 +948,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, } static float game_anim_length(game_state *oldstate, - game_state *newstate, int dir) + game_state *newstate, int dir, game_ui *ui) { if ((dir > 0 && newstate->just_used_solve) || (dir < 0 && oldstate->just_used_solve)) @@ -945,7 +958,7 @@ static float game_anim_length(game_state *oldstate, } static float game_flash_length(game_state *oldstate, - game_state *newstate, int dir) + game_state *newstate, int dir, game_ui *ui) { if (!oldstate->completed && newstate->completed && !oldstate->used_solve && !newstate->used_solve) @@ -959,6 +972,11 @@ static int game_wants_statusbar(void) return TRUE; } +static int game_timing_state(game_state *state) +{ + return TRUE; +} + #ifdef COMBINED #define thegame sixteen #endif @@ -973,9 +991,9 @@ const struct game thegame = { dup_params, TRUE, game_configure, custom_params, validate_params, - new_game_seed, + new_game_desc, game_free_aux_info, - validate_seed, + validate_desc, new_game, dup_game, free_game, @@ -992,4 +1010,5 @@ const struct game thegame = { game_anim_length, game_flash_length, game_wants_statusbar, + FALSE, game_timing_state, };