X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/f96188ff220392d9e2fac751d20e087b1e8f3b9e..c5e949657127f3c752cdc693cb71636711d9ecb1:/galaxies.c diff --git a/galaxies.c b/galaxies.c index 58e33eb..6989fe3 100644 --- a/galaxies.c +++ b/galaxies.c @@ -298,8 +298,8 @@ static void add_assoc(game_state *state, space *tile, space *dot) { tile->dotx = dot->x; tile->doty = dot->y; dot->nassoc++; - debug(("add_assoc sp %d %d --> dot %d,%d, new nassoc %d.\n", - tile->x, tile->y, dot->x, dot->y, dot->nassoc)); + /*debug(("add_assoc sp %d %d --> dot %d,%d, new nassoc %d.\n", + tile->x, tile->y, dot->x, dot->y, dot->nassoc));*/ } static struct space *sp2dot(game_state *state, int x, int y) @@ -1216,8 +1216,8 @@ generate: clear_game(state, 1); ntries++; - //generate_pass(state, rs, scratch, 10, GP_DOTS); - //generate_pass(state, rs, scratch, 100, 0); + /* generate_pass(state, rs, scratch, 10, GP_DOTS); */ + /* generate_pass(state, rs, scratch, 100, 0); */ generate_pass(state, rs, scratch, 100, GP_DOTS); game_update_dots(state); @@ -2205,7 +2205,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, solver_obvious(tmp); else solver_state(tmp, DIFF_UNREASONABLE-1); - ret = diff_game(state, tmp, 0); + ret = diff_game(state, tmp, 1); free_game(tmp); return ret; } @@ -2225,8 +2225,8 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, } else if (button == RIGHT_BUTTON) { int px1, py1; - px = 2*(int)(FROMCOORD((float)x) + 0.5); - py = 2*(int)(FROMCOORD((float)y) + 0.5); + px = (int)(2*FROMCOORD((float)x) + 0.5); + py = (int)(2*FROMCOORD((float)y) + 0.5); dot = NULL; @@ -2245,8 +2245,8 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, * Found a dot. Begin a drag from it. */ dot = &SPACE(state, px1, py1); - ui->srcx = px; - ui->srcy = py; + ui->srcx = px1; + ui->srcy = py1; goto done; /* multi-level break */ } } @@ -2594,6 +2594,7 @@ static game_state *execute_move(game_state *state, char *move) #endif } else if (c == 'S') { move++; + ret->used_solve = 1; } else goto badmove; @@ -3230,11 +3231,11 @@ const struct game thegame = { FALSE, FALSE, NULL, NULL, TRUE, /* wants_statusbar */ #else - TRUE, TRUE, game_print_size, game_print, + TRUE, FALSE, game_print_size, game_print, FALSE, /* wants_statusbar */ #endif FALSE, game_timing_state, - 0, /* flags */ + REQUIRE_RBUTTON, /* flags */ }; #ifdef STANDALONE_SOLVER