}
static int c2n(char c) {
- if (isdigit(c))
+ if (isdigit((unsigned char)c))
return (int)(c - '0');
else if (c >= 'a' && c <= 'z')
return (int)(c - 'a' + 10);
}
}
-static int check_rowcol(game_state *state, int starti, int di, int sz, int mark_errors)
+#define CC_MARK_ERRORS 1
+#define CC_MUST_FILL 2
+
+static int check_rowcol(game_state *state, int starti, int di, int sz, unsigned flags)
{
int nerr = 0, n, m, i, j;
if (state->nums[i] != state->nums[j]) continue;
nerr++; /* ok, we have two numbers the same in a row. */
- if (!mark_errors) continue;
+ if (!(flags & CC_MARK_ERRORS)) continue;
/* If we have two circles in the same row around
* two identical numbers, they are _both_ wrong. */
return nerr;
}
-static int check_complete(game_state *state, int mark_errors)
+static int check_complete(game_state *state, unsigned flags)
{
int *dsf = snewn(state->n, int);
int x, y, i, error = 0, nwhite, w = state->w, h = state->h;
- if (mark_errors) {
+ if (flags & CC_MARK_ERRORS) {
for (i = 0; i < state->n; i++)
state->flags[i] &= ~F_ERROR;
}
connect_dsf(state, dsf);
+ /* If we're the solver we need the grid all to be definitively
+ * black or definitively white (i.e. circled) otherwise the solver
+ * has found an ambiguous grid. */
+ if (flags & CC_MUST_FILL) {
+ for (i = 0; i < state->n; i++) {
+ if (!(state->flags[i] & F_BLACK) && !(state->flags[i] & F_CIRCLE))
+ error += 1;
+ }
+ }
+
/* Mark any black squares in groups of >1 as errors.
* Count number of white squares. */
nwhite = 0;
if (state->flags[i] & F_BLACK) {
if (dsf_size(dsf, i) > 1) {
error += 1;
- if (mark_errors)
+ if (flags & CC_MARK_ERRORS)
state->flags[i] |= F_ERROR;
}
} else
/* Check attributes of white squares, row- and column-wise. */
for (x = 0; x < w; x++) /* check cols from (x,0) */
- error += check_rowcol(state, x, w, h, mark_errors);
+ error += check_rowcol(state, x, w, h, flags);
for (y = 0; y < h; y++) /* check rows from (0,y) */
- error += check_rowcol(state, y*w, 1, w, mark_errors);
+ error += check_rowcol(state, y*w, 1, w, flags);
/* mark (all) white regions as an error if there is more than one.
* may want to make this less in-your-face (by only marking
if (!(state->flags[i] & F_BLACK) &&
dsf_size(dsf, i) < nwhite) {
error += 1;
- if (mark_errors)
+ if (flags & CC_MARK_ERRORS)
state->flags[i] |= F_ERROR;
}
}
}
sop = &(ss->ops[ss->n_ops++]);
sop->x = x; sop->y = y; sop->op = op; sop->desc = desc;
- debug(("added solver op %s ('%s') at (%d,%d)",
+ debug(("added solver op %s ('%s') at (%d,%d)\n",
op == BLACK ? "BLACK" : "CIRCLE", desc, x, y));
}
if (!INGRID(state, x, y)) return;
if (state->flags[i] & F_BLACK) {
- debug(("... solver wants to add auto-circle on black (%d,%d)", x, y));
+ debug(("... solver wants to add auto-circle on black (%d,%d)\n", x, y));
state->impossible = 1;
return;
}
if (!INGRID(state, x, y)) return;
if (state->nums[i] != num) return;
if (state->flags[i] & F_CIRCLE) {
- debug(("... solver wants to add auto-black on circled(%d,%d)", x, y));
+ debug(("... solver wants to add auto-black on circled(%d,%d)\n", x, y));
state->impossible = 1;
return;
}
if (op.op == BLACK) {
if (state->flags[i] & F_CIRCLE) {
- debug(("Solver wants to blacken circled square (%d,%d)!", op.x, op.y));
+ debug(("Solver wants to blacken circled square (%d,%d)!\n", op.x, op.y));
state->impossible = 1;
return n_ops;
}
if (!(state->flags[i] & F_BLACK)) {
- debug(("... solver adding black at (%d,%d): %s", op.x, op.y, op.desc));
+ debug(("... solver adding black at (%d,%d): %s\n", op.x, op.y, op.desc));
#ifdef STANDALONE_SOLVER
if (verbose)
printf("Adding black at (%d,%d): %s\n", op.x, op.y, op.desc);
}
} else {
if (state->flags[i] & F_BLACK) {
- debug(("Solver wants to circle blackened square (%d,%d)!", op.x, op.y));
+ debug(("Solver wants to circle blackened square (%d,%d)!\n", op.x, op.y));
state->impossible = 1;
return n_ops;
}
if (!(state->flags[i] & F_CIRCLE)) {
- debug(("... solver adding circle at (%d,%d): %s", op.x, op.y, op.desc));
+ debug(("... solver adding circle at (%d,%d): %s\n", op.x, op.y, op.desc));
#ifdef STANDALONE_SOLVER
if (verbose)
printf("Adding circle at (%d,%d): %s\n", op.x, op.y, op.desc);
solver_op_add(ss, ifree%state->w, ifree/state->w, CIRCLE,
"CC/CE/QM: white cell with single non-black around it");
else {
- debug(("White cell with no escape at (%d,%d)", x, y));
+ debug(("White cell with no escape at (%d,%d)\n", x, y));
state->impossible = 1;
return 0;
}
if (an == dn) {
/* We have a match; so (WLOG) the 'A' marked above are at
* (x1,y1) and (x2,y2), and the 'B' are at (ax,ay) and (dx,dy). */
- debug(("Found offset-pair: %d at (%d,%d) and (%d,%d)",
+ debug(("Found offset-pair: %d at (%d,%d) and (%d,%d)\n",
state->nums[y1*w + x1], x1, y1, x2, y2));
- debug((" and: %d at (%d,%d) and (%d,%d)",
+ debug((" and: %d at (%d,%d) and (%d,%d)\n",
an, ax, ay, dx[d], dy[d]));
xd = dx[d] - x2; yd = dy[d] - y2;
state->flags[i] &= ~F_SCRATCH;
}
if (lwhite == -1) {
- debug(("solve_hassinglewhite: no white squares found!"));
+ debug(("solve_hassinglewhite: no white squares found!\n"));
state->impossible = 1;
return 0;
}
int i, x, y, n_ops = ss->n_ops;
if (!solve_hassinglewhiteregion(state, ss)) {
- debug(("solve_removesplits: white region is not contiguous at start!"));
+ debug(("solve_removesplits: white region is not contiguous at start!\n"));
state->impossible = 1;
return 0;
}
}
solver_state_free(ss);
- return state->impossible ? -1 : check_complete(state, 0);
+ return state->impossible ? -1 : check_complete(state, CC_MUST_FILL);
}
static char *solve_game(game_state *state, game_state *currstate,
}
if (sret <= 0 || sret_easy > 0) {
- debug(("Generated puzzle %s at chosen difficulty %s",
+ debug(("Generated puzzle %s at chosen difficulty %s\n",
sret <= 0 ? "insoluble" : "too easy",
singles_diffnames[params->diff]));
return 0;
generate:
ss->n_ops = 0;
- debug(("Starting game generation, size %dx%d", w, h));
+ debug(("Starting game generation, size %dx%d\n", w, h));
memset(state->flags, 0, state->n*sizeof(unsigned int));
for (j = 0; j < state->n; j++) {
i = scratch[j];
if ((state->flags[i] & F_CIRCLE) || (state->flags[i] & F_BLACK)) {
- debug(("generator skipping (%d,%d): %s", i%w, i/w,
+ debug(("generator skipping (%d,%d): %s\n", i%w, i/w,
(state->flags[i] & F_CIRCLE) ? "CIRCLE" : "BLACK"));
continue; /* solver knows this must be one or the other already. */
}
solver_ops_do(state, ss);
if (state->impossible) {
- debug(("generator made impossible, restarting..."));
+ debug(("generator made impossible, restarting...\n"));
goto generate;
}
}
!new_game_is_good(params, state, tosolve)) {
ntries++;
if (ntries > MAXTRIES) {
- debug(("Ran out of randomisation attempts, re-generating."));
+ debug(("Ran out of randomisation attempts, re-generating.\n"));
goto generate;
}
- debug(("Re-randomising numbers under black squares."));
+ debug(("Re-randomising numbers under black squares.\n"));
goto randomise;
}
unsigned int *flags;
};
-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 mx, int my, int button)
{
char buf[80], c;
game_state *ret = dup_game(state);
int x, y, i, n;
- debug(("move: %s", move));
+ debug(("move: %s\n", move));
while (*move) {
char c = *move;
else if (*move)
goto badmove;
}
- if (check_complete(ret, 1)) ret->completed = 1;
+ if (check_complete(ret, CC_MARK_ERRORS)) ret->completed = 1;
return ret;
badmove:
return 0.0F;
}
+static int game_status(game_state *state)
+{
+ return state->completed ? +1 : 0;
+}
+
static int game_timing_state(game_state *state, game_ui *ui)
{
return TRUE;
game_redraw,
game_anim_length,
game_flash_length,
+ game_status,
TRUE, FALSE, game_print_size, game_print,
FALSE, /* wants_statusbar */
FALSE, game_timing_state,