X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/ae8290c655dec864db8ef0dc6b59891d6434c71f..6dae1679977511f3dc97a15e558fc23b4d796012:/mines.c diff --git a/mines.c b/mines.c index f9f714b..f3e216c 100644 --- a/mines.c +++ b/mines.c @@ -237,7 +237,7 @@ static game_params *custom_params(config_item *cfg) return ret; } -static char *validate_params(game_params *params) +static char *validate_params(game_params *params, int full) { /* * Lower limit on grid size: each dimension must be at least 3. @@ -253,7 +253,7 @@ static char *validate_params(game_params *params) * _have_ to have a gap somewhere which you can't determine the * position of. */ - if (params->w <= 2 || params->h <= 2) + if (full && params->unique && (params->w <= 2 || params->h <= 2)) return "Width and height must both be greater than two"; if (params->n > params->w * params->h - 9) return "Too many mines for grid size"; @@ -1946,7 +1946,7 @@ static char *new_mine_layout(int w, int h, int n, int x, int y, int unique, } static char *new_game_desc(game_params *params, random_state *rs, - game_aux_info **aux, int interactive) + char **aux, int interactive) { /* * We generate the coordinates of an initial click even if they @@ -1984,17 +1984,13 @@ static char *new_game_desc(game_params *params, random_state *rs, } } -static void game_free_aux_info(game_aux_info *aux) -{ - assert(!"Shouldn't happen"); -} - static char *validate_desc(game_params *params, char *desc) { int wh = params->w * params->h; int x, y; if (*desc == 'r') { + desc++; if (!*desc || !isdigit((unsigned char)*desc)) return "No initial mine count in game description"; while (*desc && isdigit((unsigned char)*desc)) @@ -2298,7 +2294,7 @@ static void free_game(game_state *state) } static char *solve_game(game_state *state, game_state *currstate, - game_aux_info *aux, char **error) + char *aux, char **error) { if (!state->layout->mines) { *error = "Game has not been started yet"; @@ -2357,7 +2353,7 @@ static void free_ui(game_ui *ui) sfree(ui); } -char *encode_ui(game_ui *ui) +static char *encode_ui(game_ui *ui) { char buf[80]; /* @@ -2367,7 +2363,7 @@ char *encode_ui(game_ui *ui) return dupstr(buf); } -void decode_ui(game_ui *ui, char *encoding) +static void decode_ui(game_ui *ui, char *encoding) { sscanf(encoding, "D%d", &ui->deaths); } @@ -2608,27 +2604,23 @@ static game_state *execute_move(game_state *from, char *move) * Drawing routines. */ -static void game_size(game_params *params, game_drawstate *ds, - int *x, int *y, int expand) +static void game_compute_size(game_params *params, int tilesize, + int *x, int *y) { - int tsx, tsy, ts; - /* - * Each window dimension equals the tile size times 3 more than - * the grid dimension (the border is 3/2 the width of the - * tiles). - */ - tsx = *x / (params->w + 3); - tsy = *y / (params->h + 3); - ts = min(tsx, tsy); - if (expand) - ds->tilesize = ts; - else - ds->tilesize = min(ts, PREFERRED_TILE_SIZE); + /* Ick: fake up `ds->tilesize' for macro expansion purposes */ + struct { int tilesize; } ads, *ds = &ads; + ads.tilesize = tilesize; *x = BORDER * 2 + TILE_SIZE * params->w; *y = BORDER * 2 + TILE_SIZE * params->h; } +static void game_set_size(game_drawstate *ds, game_params *params, + int tilesize) +{ + ds->tilesize = tilesize; +} + static float *game_colours(frontend *fe, game_state *state, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); @@ -2755,13 +2747,12 @@ static void draw_tile(frontend *fe, game_drawstate *ds, coords[3] = y; coords[4] = x; coords[5] = y + TILE_SIZE - 1; - draw_polygon(fe, coords, 3, TRUE, COL_LOWLIGHT ^ hl); - draw_polygon(fe, coords, 3, FALSE, COL_LOWLIGHT ^ hl); + draw_polygon(fe, coords, 3, COL_LOWLIGHT ^ hl, COL_LOWLIGHT ^ hl); coords[0] = x; coords[1] = y; - draw_polygon(fe, coords, 3, TRUE, COL_HIGHLIGHT ^ hl); - draw_polygon(fe, coords, 3, FALSE, COL_HIGHLIGHT ^ hl); + draw_polygon(fe, coords, 3, COL_HIGHLIGHT ^ hl, + COL_HIGHLIGHT ^ hl); draw_rect(fe, x + HIGHLIGHT_WIDTH, y + HIGHLIGHT_WIDTH, TILE_SIZE - 2*HIGHLIGHT_WIDTH, TILE_SIZE - 2*HIGHLIGHT_WIDTH, @@ -2782,14 +2773,12 @@ static void draw_tile(frontend *fe, game_drawstate *ds, SETCOORD(3, 0.25, 0.8); SETCOORD(4, 0.55, 0.7); SETCOORD(5, 0.55, 0.35); - draw_polygon(fe, coords, 6, TRUE, COL_FLAGBASE); - draw_polygon(fe, coords, 6, FALSE, COL_FLAGBASE); + draw_polygon(fe, coords, 6, COL_FLAGBASE, COL_FLAGBASE); SETCOORD(0, 0.6, 0.2); SETCOORD(1, 0.6, 0.5); SETCOORD(2, 0.2, 0.35); - draw_polygon(fe, coords, 3, TRUE, COL_FLAG); - draw_polygon(fe, coords, 3, FALSE, COL_FLAG); + draw_polygon(fe, coords, 3, COL_FLAG, COL_FLAG); #undef SETCOORD } else if (v == -3) { @@ -2867,8 +2856,7 @@ static void draw_tile(frontend *fe, game_drawstate *ds, xdy = -tdy; } - draw_polygon(fe, coords, 5*4, TRUE, COL_MINE); - draw_polygon(fe, coords, 5*4, FALSE, COL_MINE); + draw_polygon(fe, coords, 5*4, COL_MINE, COL_MINE); draw_rect(fe, cx-r/3, cy-r/3, r/3, r/4, COL_HIGHLIGHT); } @@ -2933,13 +2921,11 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, coords[9] = COORD(state->h) + OUTER_HIGHLIGHT_WIDTH - 1; coords[6] = coords[8] + TILE_SIZE; coords[7] = coords[9] - TILE_SIZE; - draw_polygon(fe, coords, 5, TRUE, COL_HIGHLIGHT); - draw_polygon(fe, coords, 5, FALSE, COL_HIGHLIGHT); + draw_polygon(fe, coords, 5, COL_HIGHLIGHT, COL_HIGHLIGHT); coords[1] = COORD(0) - OUTER_HIGHLIGHT_WIDTH; coords[0] = COORD(0) - OUTER_HIGHLIGHT_WIDTH; - draw_polygon(fe, coords, 5, TRUE, COL_LOWLIGHT); - draw_polygon(fe, coords, 5, FALSE, COL_LOWLIGHT); + draw_polygon(fe, coords, 5, COL_LOWLIGHT, COL_LOWLIGHT); ds->started = TRUE; } @@ -3045,7 +3031,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, @@ -3059,7 +3044,7 @@ const struct game thegame = { game_changed_state, interpret_move, execute_move, - game_size, + PREFERRED_TILE_SIZE, game_compute_size, game_set_size, game_colours, game_new_drawstate, game_free_drawstate, @@ -3085,7 +3070,7 @@ const struct game thegame = { * $ ./mineobfusc 9x9:4,4,004000007c00010022080 * 9x9:4,4,mb071b49fbd1cb6a0d5868 * - * gcc -DSTANDALONE_OBFUSCATOR -o mineobfusc mines.c malloc.c random.c tree234.c + * gcc -DSTANDALONE_OBFUSCATOR -o mineobfusc mines.c malloc.c random.c tree234.c misc.c */ #include @@ -3096,13 +3081,13 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, void draw_rect(frontend *fe, int x, int y, int w, int h, int colour) {} void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour) {} void draw_polygon(frontend *fe, int *coords, int npoints, - int fill, int colour) {} + int fillcolour, int outlinecolour) {} void clip(frontend *fe, int x, int y, int w, int h) {} void unclip(frontend *fe) {} void start_draw(frontend *fe) {} void draw_update(frontend *fe, int x, int y, int w, int h) {} void end_draw(frontend *fe) {} -void midend_supersede_game_desc(midend_data *me, char *desc) {} +void midend_supersede_game_desc(midend_data *me, char *desc, char *privdesc) {} void status_bar(frontend *fe, char *text) {} void fatal(char *fmt, ...) @@ -3123,15 +3108,13 @@ int main(int argc, char **argv) { game_params *p; game_state *s; - int recurse = TRUE; char *id = NULL, *desc, *err; int y, x; - int grade = FALSE; while (--argc > 0) { char *p = *++argv; if (*p == '-') { - fprintf(stderr, "%s: unrecognised option `%s'\n", argv[0]); + fprintf(stderr, "%s: unrecognised option `%s'\n", argv[0], p); return 1; } else { id = p;