X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/4d08de49555f22d1fcf2d9977a19591a0f465b2d..HEAD:/flip.c diff --git a/flip.c b/flip.c index 2ec16ba..c30e484 100644 --- a/flip.c +++ b/flip.c @@ -116,11 +116,11 @@ static game_params *dup_params(game_params *params) static void decode_params(game_params *ret, char const *string) { ret->w = ret->h = atoi(string); - while (*string && isdigit(*string)) string++; + while (*string && isdigit((unsigned char)*string)) string++; if (*string == 'x') { string++; ret->h = atoi(string); - while (*string && isdigit(*string)) string++; + while (*string && isdigit((unsigned char)*string)) string++; } if (*string == 'r') { string++; @@ -613,7 +613,7 @@ static char *validate_desc(game_params *params, char *desc) return NULL; } -static game_state *new_game(midend_data *me, game_params *params, char *desc) +static game_state *new_game(midend *me, game_params *params, char *desc) { int w = params->w, h = params->h, wh = w * h; int mlen = (wh*wh+3)/4; @@ -853,6 +853,11 @@ static char *solve_game(game_state *state, game_state *currstate, return ret; } +static int game_can_format_as_text_now(game_params *params) +{ + return TRUE; +} + static char *game_text_format(game_state *state) { return NULL; @@ -894,14 +899,13 @@ struct game_drawstate { int tilesize; }; -static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, +static char *interpret_move(game_state *state, game_ui *ui, const game_drawstate *ds, int x, int y, int button) { - int w = state->w, h = state->h /*, wh = w * h */; + int w = state->w, h = state->h, wh = w * h; char buf[80], *nullret = NULL; - if (button == LEFT_BUTTON || button == CURSOR_SELECT || - button == ' ' || button == '\r' || button == '\n') { + if (button == LEFT_BUTTON || IS_CURSOR_SELECT(button)) { int tx, ty; if (button == LEFT_BUTTON) { tx = FROMCOORD(x), ty = FROMCOORD(y); @@ -913,12 +917,25 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, nullret = ""; if (tx >= 0 && tx < w && ty >= 0 && ty < h) { - sprintf(buf, "M%d,%d", tx, ty); - return dupstr(buf); + /* + * It's just possible that a manually entered game ID + * will have at least one square do nothing whatsoever. + * If so, we avoid encoding a move at all. + */ + int i = ty*w+tx, j, makemove = FALSE; + for (j = 0; j < wh; j++) { + if (state->matrix->matrix[i*wh+j]) + makemove = TRUE; + } + if (makemove) { + sprintf(buf, "M%d,%d", tx, ty); + return dupstr(buf); + } else { + return NULL; + } } } - else if (button == CURSOR_UP || button == CURSOR_DOWN || - button == CURSOR_RIGHT || button == CURSOR_LEFT) { + else if (IS_CURSOR_MOVE(button)) { int dx = 0, dy = 0; switch (button) { case CURSOR_UP: dy = -1; break; @@ -999,13 +1016,13 @@ static void game_compute_size(game_params *params, int tilesize, *y = TILE_SIZE * params->h + 2 * BORDER; } -static void game_set_size(game_drawstate *ds, game_params *params, - int tilesize) +static void game_set_size(drawing *dr, game_drawstate *ds, + game_params *params, int tilesize) { ds->tilesize = tilesize; } -static float *game_colours(frontend *fe, game_state *state, int *ncolours) +static float *game_colours(frontend *fe, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); @@ -1039,7 +1056,7 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours) return ret; } -static game_drawstate *game_new_drawstate(game_state *state) +static game_drawstate *game_new_drawstate(drawing *dr, game_state *state) { struct game_drawstate *ds = snew(struct game_drawstate); int i; @@ -1055,13 +1072,13 @@ static game_drawstate *game_new_drawstate(game_state *state) return ds; } -static void game_free_drawstate(game_drawstate *ds) +static void game_free_drawstate(drawing *dr, game_drawstate *ds) { sfree(ds->tiles); sfree(ds); } -static void draw_tile(frontend *fe, game_drawstate *ds, +static void draw_tile(drawing *dr, game_drawstate *ds, game_state *state, int x, int y, int tile, int anim, float animtime) { @@ -1069,9 +1086,9 @@ static void draw_tile(frontend *fe, game_drawstate *ds, int bx = x * TILE_SIZE + BORDER, by = y * TILE_SIZE + BORDER; int i, j, dcol = (tile & 4) ? COL_CURSOR : COL_DIAG; - clip(fe, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1); + clip(dr, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1); - draw_rect(fe, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1, + draw_rect(dr, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1, anim ? COL_BACKGROUND : tile & 1 ? COL_WRONG : COL_RIGHT); if (anim) { /* @@ -1082,18 +1099,18 @@ static void draw_tile(frontend *fe, game_drawstate *ds, coords[0] = bx + TILE_SIZE; coords[1] = by; - coords[2] = bx + TILE_SIZE * animtime; - coords[3] = by + TILE_SIZE * animtime; + coords[2] = bx + (int)((float)TILE_SIZE * animtime); + coords[3] = by + (int)((float)TILE_SIZE * animtime); coords[4] = bx; coords[5] = by + TILE_SIZE; - coords[6] = bx + TILE_SIZE - TILE_SIZE * animtime; - coords[7] = by + TILE_SIZE - TILE_SIZE * animtime; + coords[6] = bx + TILE_SIZE - (int)((float)TILE_SIZE * animtime); + coords[7] = by + TILE_SIZE - (int)((float)TILE_SIZE * animtime); colour = (tile & 1 ? COL_WRONG : COL_RIGHT); if (animtime < 0.5) colour = COL_WRONG + COL_RIGHT - colour; - draw_polygon(fe, coords, 4, colour, COL_GRID); + draw_polygon(dr, coords, 4, colour, COL_GRID); } /* @@ -1108,12 +1125,12 @@ static void draw_tile(frontend *fe, game_drawstate *ds, int cx = (bx + TILE_SIZE/2) + (2 * ox - 1) * td; int cy = (by + TILE_SIZE/2) + (2 * oy - 1) * td; if (ox == 0 && oy == 0) - draw_rect(fe, cx, cy, 2*td+1, 2*td+1, dcol); + draw_rect(dr, cx, cy, 2*td+1, 2*td+1, dcol); else { - draw_line(fe, cx, cy, cx+2*td, cy, dcol); - draw_line(fe, cx, cy+2*td, cx+2*td, cy+2*td, dcol); - draw_line(fe, cx, cy, cx, cy+2*td, dcol); - draw_line(fe, cx+2*td, cy, cx+2*td, cy+2*td, dcol); + draw_line(dr, cx, cy, cx+2*td, cy, dcol); + draw_line(dr, cx, cy+2*td, cx+2*td, cy+2*td, dcol); + draw_line(dr, cx, cy, cx, cy+2*td, dcol); + draw_line(dr, cx+2*td, cy, cx+2*td, cy+2*td, dcol); } } @@ -1125,20 +1142,20 @@ static void draw_tile(frontend *fe, game_drawstate *ds, int y1 = by + TILE_SIZE / 20, y2 = by + TILE_SIZE - TILE_SIZE / 20; int i = 3; while (i--) { - draw_line(fe, x1, y1, x2, y1, COL_HINT); - draw_line(fe, x1, y2, x2, y2, COL_HINT); - draw_line(fe, x1, y1, x1, y2, COL_HINT); - draw_line(fe, x2, y1, x2, y2, COL_HINT); + draw_line(dr, x1, y1, x2, y1, COL_HINT); + draw_line(dr, x1, y2, x2, y2, COL_HINT); + draw_line(dr, x1, y1, x1, y2, COL_HINT); + draw_line(dr, x2, y1, x2, y2, COL_HINT); x1++, y1++, x2--, y2--; } } - unclip(fe); + unclip(dr); - draw_update(fe, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1); + draw_update(dr, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1); } -static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, +static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, game_state *state, int dir, game_ui *ui, float animtime, float flashtime) { @@ -1146,29 +1163,29 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, int i, flashframe; if (!ds->started) { - draw_rect(fe, 0, 0, TILE_SIZE * w + 2 * BORDER, + draw_rect(dr, 0, 0, TILE_SIZE * w + 2 * BORDER, TILE_SIZE * h + 2 * BORDER, COL_BACKGROUND); /* * Draw the grid lines. */ for (i = 0; i <= w; i++) - draw_line(fe, i * TILE_SIZE + BORDER, BORDER, + draw_line(dr, i * TILE_SIZE + BORDER, BORDER, i * TILE_SIZE + BORDER, h * TILE_SIZE + BORDER, COL_GRID); for (i = 0; i <= h; i++) - draw_line(fe, BORDER, i * TILE_SIZE + BORDER, + draw_line(dr, BORDER, i * TILE_SIZE + BORDER, w * TILE_SIZE + BORDER, i * TILE_SIZE + BORDER, COL_GRID); - draw_update(fe, 0, 0, TILE_SIZE * w + 2 * BORDER, + draw_update(dr, 0, 0, TILE_SIZE * w + 2 * BORDER, TILE_SIZE * h + 2 * BORDER); ds->started = TRUE; } if (flashtime) - flashframe = flashtime / FLASH_FRAME; + flashframe = (int)(flashtime / FLASH_FRAME); else flashframe = -1; @@ -1195,13 +1212,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, if (ui->cdraw && ui->cx == x && ui->cy == y) v |= 4; - if (oldstate && state->grid[i] != oldstate->grid[i]) + if (oldstate && ((state->grid[i] ^ oldstate->grid[i]) &~ 2)) vv = 255; /* means `animated' */ else vv = v; if (ds->tiles[i] == 255 || vv == 255 || ds->tiles[i] != vv) { - draw_tile(fe, ds, state, x, y, v, vv == 255, animtime); + draw_tile(dr, ds, state, x, y, v, vv == 255, animtime); ds->tiles[i] = vv; } } @@ -1215,7 +1232,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, (state->cheated ? "Auto-solver used. " : "")), state->moves); - status_bar(fe, buf); + status_bar(dr, buf); } } @@ -1234,9 +1251,9 @@ static float game_flash_length(game_state *oldstate, game_state *newstate, return 0.0F; } -static int game_wants_statusbar(void) +static int game_status(game_state *state) { - return TRUE; + return state->completed ? +1 : 0; } static int game_timing_state(game_state *state, game_ui *ui) @@ -1244,12 +1261,20 @@ static int game_timing_state(game_state *state, game_ui *ui) return TRUE; } +static void game_print_size(game_params *params, float *x, float *y) +{ +} + +static void game_print(drawing *dr, game_state *state, int tilesize) +{ +} + #ifdef COMBINED #define thegame flip #endif const struct game thegame = { - "Flip", "games.flip", + "Flip", "games.flip", "flip", default_params, game_fetch_preset, decode_params, @@ -1264,7 +1289,7 @@ const struct game thegame = { dup_game, free_game, TRUE, solve_game, - FALSE, game_text_format, + FALSE, game_can_format_as_text_now, game_text_format, new_ui, free_ui, encode_ui, @@ -1279,7 +1304,9 @@ const struct game thegame = { game_redraw, game_anim_length, game_flash_length, - game_wants_statusbar, + game_status, + FALSE, FALSE, game_print_size, game_print, + TRUE, /* wants_statusbar */ FALSE, game_timing_state, - 0, /* mouse_priorities */ + 0, /* flags */ };