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)
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);
#define PREFERRED_TILE_SIZE 32
#define TILE_SIZE (ds->tilesize)
#define DOT_SIZE (TILE_SIZE / 4)
-#define EDGE_THICKNESS (TILE_SIZE / 16)
+#define EDGE_THICKNESS (max(TILE_SIZE / 16, 2))
#define BORDER TILE_SIZE
#define COORD(x) ( (x) * TILE_SIZE + BORDER )
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;
}
} 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;
* 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 */
}
}
#endif
} else if (c == 'S') {
move++;
+ ret->used_solve = 1;
} else
goto badmove;
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