X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/4496362fadb5f60b8ecf431fb220d26df7280f99..4497b8419960a996e4fed08d2e146701d603247b:/unfinished/slide.c diff --git a/unfinished/slide.c b/unfinished/slide.c index 3ea3c95..6fac469 100644 --- a/unfinished/slide.c +++ b/unfinished/slide.c @@ -895,7 +895,7 @@ static char *validate_desc(game_params *params, char *desc) { int w = params->w, h = params->h, wh = w*h; int *active, *link; - int mains = 0, mpos = -1; + int mains = 0; int i, tx, ty, minmoves; char *ret; @@ -966,7 +966,6 @@ static char *validate_desc(game_params *params, char *desc) link[i] = -1; if (strchr("mM", c) != NULL) { mains++; - mpos = i; } i++; } @@ -2293,9 +2292,9 @@ static float game_flash_length(game_state *oldstate, game_state *newstate, return 0.0F; } -static int game_is_solved(game_state *state) +static int game_status(game_state *state) { - return state->completed; + return state->completed ? +1 : 0; } static int game_timing_state(game_state *state, game_ui *ui) @@ -2346,7 +2345,7 @@ const struct game thegame = { game_redraw, game_anim_length, game_flash_length, - game_is_solved, + game_status, FALSE, FALSE, game_print_size, game_print, TRUE, /* wants_statusbar */ FALSE, game_timing_state, @@ -2363,14 +2362,17 @@ int main(int argc, char **argv) game_state *s; char *id = NULL, *desc, *err; int count = FALSE; - int ret, really_verbose = FALSE; + int ret; int *moves; while (--argc > 0) { char *p = *++argv; + /* if (!strcmp(p, "-v")) { - really_verbose = TRUE; - } else if (!strcmp(p, "-c")) { + verbose = TRUE; + } else + */ + if (!strcmp(p, "-c")) { count = TRUE; } else if (*p == '-') { fprintf(stderr, "%s: unrecognised option `%s'\n", argv[0], p);