~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Ben Hutchings to fix an error-checking goof: Keen
[sgt/puzzles]
/
keen.c
diff --git
a/keen.c
b/keen.c
index
feee59c
..
bec5055
100644
(file)
--- a/
keen.c
+++ b/
keen.c
@@
-281,8
+281,8
@@
static int solver_common(struct latin_solver *solver, void *vctx, int diff)
for (box = 0; box < ctx->nboxes; box++) {
int *sq = ctx->boxlist + ctx->boxes[box];
int n = ctx->boxes[box+1] - ctx->boxes[box];
for (box = 0; box < ctx->nboxes; box++) {
int *sq = ctx->boxlist + ctx->boxes[box];
int n = ctx->boxes[box+1] - ctx->boxes[box];
-
int
value = ctx->clues[box] & ~CMASK;
-
int
op = ctx->clues[box] & CMASK;
+
long
value = ctx->clues[box] & ~CMASK;
+
long
op = ctx->clues[box] & CMASK;
if (diff == DIFF_HARD) {
for (i = 0; i < n; i++)
if (diff == DIFF_HARD) {
for (i = 0; i < n; i++)
@@
-1450,11
+1450,12
@@
static int check_errors(game_state *state, long *errors)
break;
case C_DIV:
{
break;
case C_DIV:
{
- int d1 = cluevals[j], d2 = state->grid[i];
- if (d1 == 0 || d2 == 0)
+ int d1 = min(cluevals[j], state->grid[i]);
+ int d2 = max(cluevals[j], state->grid[i]);
+ if (d1 == 0 || d2 % d1 != 0)
cluevals[j] = 0;
else
cluevals[j] = 0;
else
- cluevals[j] = d2
/d1 + d1/d2;/* one of them is 0 :-) */
+ cluevals[j] = d2
/ d1;
}
break;
}
}
break;
}
@@
-1844,7
+1845,7
@@
static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
/* Count the pencil marks required. */
for (i = 1, npencil = 0; i <= w; i++)
/* Count the pencil marks required. */
for (i = 1, npencil = 0; i <= w; i++)
- if (tile & (1 << (i + DF_PENCIL_SHIFT)))
+ if (tile & (1
L
<< (i + DF_PENCIL_SHIFT)))
npencil++;
if (npencil) {
npencil++;
if (npencil) {
@@
-1859,6
+1860,13
@@
static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
pr = pl + TILESIZE - GRIDEXTRA;
pt = ty + GRIDEXTRA;
pb = pt + TILESIZE - GRIDEXTRA;
pr = pl + TILESIZE - GRIDEXTRA;
pt = ty + GRIDEXTRA;
pb = pt + TILESIZE - GRIDEXTRA;
+ if (dsf_canonify(clues->dsf, y*w+x) == y*w+x) {
+ /*
+ * Make space for the clue text.
+ */
+ pt += TILESIZE/4;
+ /* minph--; */
+ }
/*
* We arrange our pencil marks in a grid layout, with
/*
* We arrange our pencil marks in a grid layout, with
@@
-1914,7
+1922,7
@@
static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
* Now actually draw the pencil marks.
*/
for (i = 1, j = 0; i <= w; i++)
* Now actually draw the pencil marks.
*/
for (i = 1, j = 0; i <= w; i++)
- if (tile & (1 << (i + DF_PENCIL_SHIFT))) {
+ if (tile & (1
L
<< (i + DF_PENCIL_SHIFT))) {
int dx = j % pw, dy = j / pw;
str[1] = '\0';
int dx = j % pw, dy = j / pw;
str[1] = '\0';
@@
-2240,6
+2248,10
@@
static void game_print(drawing *dr, game_state *state, int tilesize)
FONT_VARIABLE, TILESIZE/2,
ALIGN_VCENTRE | ALIGN_HCENTRE, ink, str);
}
FONT_VARIABLE, TILESIZE/2,
ALIGN_VCENTRE | ALIGN_HCENTRE, ink, str);
}
+
+ sfree(minus_sign);
+ sfree(times_sign);
+ sfree(divide_sign);
}
#ifdef COMBINED
}
#ifdef COMBINED