X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/4a29930e1b9db1332c93244365db1642fcfac1cd..871bf2946c5cbfdc7621c4b3d6850af0699297a0:/samegame.c diff --git a/samegame.c b/samegame.c index 6294a3d..ed516e2 100644 --- a/samegame.c +++ b/samegame.c @@ -49,6 +49,7 @@ struct game_params { #define TILE_JOINDOWN 0x0400 /* used in drawstate */ #define TILE_JOINDIAG 0x0800 /* used in drawstate */ #define TILE_HASSEL 0x1000 /* used in drawstate */ +#define TILE_IMPOSSIBLE 0x2000 /* used in drawstate */ #define TILE(gs,x,y) ((gs)->tiles[(gs)->params.w*(y)+(x)]) #define COL(gs,x,y) (TILE(gs,x,y) & TILE_COLMASK) @@ -239,7 +240,7 @@ static char *validate_params(game_params *params) */ static char *new_game_desc(game_params *params, random_state *rs, - game_aux_info **aux, int interactive) + char **aux, int interactive) { char *ret; int n, i, j, c, retlen, *tiles; @@ -281,11 +282,6 @@ static char *new_game_desc(game_params *params, random_state *rs, return ret; } -static void game_free_aux_info(game_aux_info *aux) -{ - assert(!"Shouldn't happen"); -} - static char *validate_desc(game_params *params, char *desc) { int area = params->w * params->h, i; @@ -354,8 +350,8 @@ static void free_game(game_state *state) sfree(state); } -static game_state *solve_game(game_state *state, game_state *currstate, - game_aux_info *aux, char **error) +static char *solve_game(game_state *state, game_state *currstate, + char *aux, char **error) { return NULL; } @@ -410,6 +406,15 @@ static void free_ui(game_ui *ui) sfree(ui); } +static char *encode_ui(game_ui *ui) +{ + return NULL; +} + +static void decode_ui(game_ui *ui, char *encoding) +{ +} + static void sel_clear(game_ui *ui, game_state *state) { int i; @@ -426,20 +431,37 @@ static void game_changed_state(game_ui *ui, game_state *oldstate, sel_clear(ui, newstate); } -static void sel_remove(game_ui *ui, game_state *state) +static char *sel_movedesc(game_ui *ui, game_state *state) { - int i, nremoved = 0; + int i; + char *ret, *sep, buf[80]; + int retlen, retsize; - state->score += npoints(&state->params, ui->nselected); + retsize = 256; + ret = snewn(retsize, char); + retlen = 0; + ret[retlen++] = 'M'; + sep = ""; for (i = 0; i < state->n; i++) { if (ui->tiles[i] & TILE_SELECTED) { - nremoved++; - state->tiles[i] = 0; + sprintf(buf, "%s%d", sep, i); + sep = ","; + if (retlen + strlen(buf) >= retsize) { + retsize = retlen + strlen(buf) + 256; + ret = sresize(ret, retsize, char); + } + strcpy(ret + retlen, buf); + retlen += strlen(buf); + ui->tiles[i] &= ~TILE_SELECTED; } } ui->nselected = 0; + + assert(retlen < retsize); + ret[retlen++] = '\0'; + return sresize(ret, retlen, char); } static void sel_expand(game_ui *ui, game_state *state, int tx, int ty) @@ -566,11 +588,13 @@ struct game_drawstate { int *tiles; /* contains colour and SELECTED. */ }; -static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, - int x, int y, int button) +static game_state *execute_move(game_state *from, char *move); + +static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, + int x, int y, int button) { int tx, ty; - game_state *ret = from; + char *ret = ""; ui->displaysel = 0; @@ -582,8 +606,8 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, ui->displaysel = 1; dx = (button == CURSOR_LEFT) ? -1 : ((button == CURSOR_RIGHT) ? +1 : 0); dy = (button == CURSOR_DOWN) ? +1 : ((button == CURSOR_UP) ? -1 : 0); - ui->xsel = (ui->xsel + from->params.w + dx) % from->params.w; - ui->ysel = (ui->ysel + from->params.h + dy) % from->params.h; + ui->xsel = (ui->xsel + state->params.w + dx) % state->params.w; + ui->ysel = (ui->ysel + state->params.h + dy) % state->params.h; return ret; } else if (button == CURSOR_SELECT || button == ' ' || button == '\r' || button == '\n') { @@ -593,30 +617,71 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, } else return NULL; - if (tx < 0 || tx >= from->params.w || ty < 0 || ty >= from->params.h) + if (tx < 0 || tx >= state->params.w || ty < 0 || ty >= state->params.h) return NULL; - if (COL(from, tx, ty) == 0) return NULL; + if (COL(state, tx, ty) == 0) return NULL; if (ISSEL(ui,tx,ty)) { if (button == RIGHT_BUTTON) - sel_clear(ui, from); + sel_clear(ui, state); else { - /* this is the actual move. */ - ret = dup_game(from); - sel_remove(ui, ret); - sg_snuggle(ret); /* shifts blanks down and to the left */ - sg_check(ret); /* checks for completeness or impossibility */ + game_state *tmp; + + ret = sel_movedesc(ui, state); + + /* + * Unfortunately, we must check for completeness or + * impossibility now, in order to update the game_ui; + * and we can't do that without constructing the new + * grid. Sigh. + */ + tmp = execute_move(state, ret); + if (tmp->complete || tmp->impossible) + ui->displaysel = 0; + free_game(tmp); } } else { - sel_clear(ui, from); /* might be no-op */ - sel_expand(ui, from, tx, ty); + sel_clear(ui, state); /* might be no-op */ + sel_expand(ui, state, tx, ty); } - if (ret->complete || ret->impossible) - ui->displaysel = 0; return ret; } +static game_state *execute_move(game_state *from, char *move) +{ + int i, n; + game_state *ret; + + if (move[0] == 'M') { + ret = dup_game(from); + + n = 0; + move++; + + while (*move) { + i = atoi(move); + if (i < 0 || i >= ret->n) { + free_game(ret); + return NULL; + } + n++; + ret->tiles[i] = 0; + + while (*move && isdigit((unsigned char)*move)) move++; + if (*move == ',') move++; + } + + ret->score += npoints(&ret->params, n); + + sg_snuggle(ret); /* shifts blanks down and to the left */ + sg_check(ret); /* checks for completeness or impossibility */ + + return ret; + } else + return NULL; /* couldn't parse move string */ +} + /* ---------------------------------------------------------------------- * Drawing routines. */ @@ -624,7 +689,7 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, static void game_size(game_params *params, game_drawstate *ds, int *x, int *y, int expand) { - int tsx, tsy, ts; + double tsx, tsy, ts; /* * We could choose the tile gap dynamically as well if we @@ -643,14 +708,14 @@ static void game_size(game_params *params, game_drawstate *ds, int *x, int *y, * We must cast to unsigned before adding to *x and *y, since * they might be INT_MAX! */ - tsx = (unsigned)(*x + ds->tilegap) / (params->w + 1); - tsy = (unsigned)(*y + ds->tilegap) / (params->h + 1); + tsx = ((double)*x + (double)ds->tilegap) / ((double)params->w + 1.0); + tsy = ((double)*y + (double)ds->tilegap) / ((double)params->h + 1.0); ts = min(tsx, tsy); if (expand) - ds->tileinner = ts - ds->tilegap; + ds->tileinner = (int)(ts+0.5) - ds->tilegap; else - ds->tileinner = min(ts, PREFERRED_TILE_SIZE) - ds->tilegap; + ds->tileinner = min((int)ts, PREFERRED_TILE_SIZE) - ds->tilegap; *x = TILE_SIZE * params->w + 2 * BORDER - TILE_GAP; *y = TILE_SIZE * params->h + 2 * BORDER - TILE_GAP; @@ -746,12 +811,12 @@ static void game_free_drawstate(game_drawstate *ds) static void tile_redraw(frontend *fe, game_drawstate *ds, int x, int y, int dright, int dbelow, - int tile, game_state *state, int bgcolour) + int tile, int bgcolour) { int outer = bgcolour, inner = outer, col = tile & TILE_COLMASK; if (col) { - if (state->impossible) { + if (tile & TILE_IMPOSSIBLE) { outer = col; inner = COL_IMPOSSIBLE; } else if (tile & TILE_SELECTED) { @@ -843,6 +908,8 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, int dbelow = (y+1 < state->params.h); tile |= ISSEL(ui,x,y); + if (state->impossible) + tile |= TILE_IMPOSSIBLE; if (dright && COL(state,x+1,y) == col) tile |= TILE_JOINRIGHT; if (dbelow && COL(state,x,y+1) == col) @@ -861,8 +928,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, (flashtime > 0.0) || (ds->bgcolour != bgcolour) || (tile != ds->tiles[i])) { - tile_redraw(fe, ds, x, y, dright, dbelow, - tile, state, bgcolour); + tile_redraw(fe, ds, x, y, dright, dbelow, tile, bgcolour); ds->tiles[i] = tile; } } @@ -928,7 +994,6 @@ const struct game thegame = { TRUE, game_configure, custom_params, validate_params, new_game_desc, - game_free_aux_info, validate_desc, new_game, dup_game, @@ -937,8 +1002,11 @@ const struct game thegame = { TRUE, game_text_format, new_ui, free_ui, + encode_ui, + decode_ui, game_changed_state, - make_move, + interpret_move, + execute_move, game_size, game_colours, game_new_drawstate,