zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Tweak to the promptness of error highlighting display.

Browse Source 
[originally from svn r8645]
This commit is contained in:
Simon Tatham
2009-09-12 12:54:49 +00:00
parent 1b927c77b7
commit e2522c2897
1 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tents.c
View File

@ -1922,7 +1922,7 @@ enum {
ERR_OVERCOMMITTED ERR_OVERCOMMITTED
}; };
static int *find_errors(game_state *state) static int *find_errors(game_state *state, char *grid)
{ {
int w = state->p.w, h = state->p.h; int w = state->p.w, h = state->p.h;
int *ret = snewn(w*h + w + h, int); int *ret = snewn(w*h + w + h, int);
@ -1944,24 +1944,24 @@ static int *find_errors(game_state *state)
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
if (y+1 < h && x+1 < w && if (y+1 < h && x+1 < w &&
((state->grid[y*w+x] == TENT && ((grid[y*w+x] == TENT &&
state->grid[(y+1)*w+(x+1)] == TENT) || grid[(y+1)*w+(x+1)] == TENT) ||
(state->grid[(y+1)*w+x] == TENT && (grid[(y+1)*w+x] == TENT &&
state->grid[y*w+(x+1)] == TENT))) { grid[y*w+(x+1)] == TENT))) {
ret[y*w+x] |= 1 << ERR_ADJ_BOTRIGHT; ret[y*w+x] |= 1 << ERR_ADJ_BOTRIGHT;
ret[(y+1)*w+x] |= 1 << ERR_ADJ_TOPRIGHT; ret[(y+1)*w+x] |= 1 << ERR_ADJ_TOPRIGHT;
ret[y*w+(x+1)] |= 1 << ERR_ADJ_BOTLEFT; ret[y*w+(x+1)] |= 1 << ERR_ADJ_BOTLEFT;
ret[(y+1)*w+(x+1)] |= 1 << ERR_ADJ_TOPLEFT; ret[(y+1)*w+(x+1)] |= 1 << ERR_ADJ_TOPLEFT;
} }
if (y+1 < h && if (y+1 < h &&
state->grid[y*w+x] == TENT && grid[y*w+x] == TENT &&
state->grid[(y+1)*w+x] == TENT) { grid[(y+1)*w+x] == TENT) {
ret[y*w+x] |= 1 << ERR_ADJ_BOT; ret[y*w+x] |= 1 << ERR_ADJ_BOT;
ret[(y+1)*w+x] |= 1 << ERR_ADJ_TOP; ret[(y+1)*w+x] |= 1 << ERR_ADJ_TOP;
} }
if (x+1 < w && if (x+1 < w &&
state->grid[y*w+x] == TENT && grid[y*w+x] == TENT &&
state->grid[y*w+(x+1)] == TENT) { grid[y*w+(x+1)] == TENT) {
ret[y*w+x] |= 1 << ERR_ADJ_RIGHT; ret[y*w+x] |= 1 << ERR_ADJ_RIGHT;
ret[y*w+(x+1)] |= 1 << ERR_ADJ_LEFT; ret[y*w+(x+1)] |= 1 << ERR_ADJ_LEFT;
} }
@ -1974,9 +1974,9 @@ static int *find_errors(game_state *state)
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int tents = 0, maybetents = 0; int tents = 0, maybetents = 0;
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
if (state->grid[y*w+x] == TENT) if (grid[y*w+x] == TENT)
tents++; tents++;
else if (state->grid[y*w+x] == BLANK) else if (grid[y*w+x] == BLANK)
maybetents++; maybetents++;
} }
ret[w*h+x] = (tents > state->numbers->numbers[x] || ret[w*h+x] = (tents > state->numbers->numbers[x] ||
@ -1985,9 +1985,9 @@ static int *find_errors(game_state *state)
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
int tents = 0, maybetents = 0; int tents = 0, maybetents = 0;
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
if (state->grid[y*w+x] == TENT) if (grid[y*w+x] == TENT)
tents++; tents++;
else if (state->grid[y*w+x] == BLANK) else if (grid[y*w+x] == BLANK)
maybetents++; maybetents++;
} }
ret[w*h+w+y] = (tents > state->numbers->numbers[w+y] || ret[w*h+w+y] = (tents > state->numbers->numbers[w+y] ||
@ -2007,15 +2007,15 @@ static int *find_errors(game_state *state)
/* Construct the equivalence classes. */ /* Construct the equivalence classes. */
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
for (x = 0; x < w-1; x++) { for (x = 0; x < w-1; x++) {
if ((state->grid[y*w+x]==TREE && state->grid[y*w+x+1]==TENT) || if ((grid[y*w+x] == TREE && grid[y*w+x+1] == TENT) ||
(state->grid[y*w+x]==TENT && state->grid[y*w+x+1]==TREE)) (grid[y*w+x] == TENT && grid[y*w+x+1] == TREE))
dsf_merge(dsf, y*w+x, y*w+x+1); dsf_merge(dsf, y*w+x, y*w+x+1);
} }
} }
for (y = 0; y < h-1; y++) { for (y = 0; y < h-1; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
if ((state->grid[y*w+x]==TREE && state->grid[(y+1)*w+x]==TENT) || if ((grid[y*w+x] == TREE && grid[(y+1)*w+x] == TENT) ||
(state->grid[y*w+x]==TENT && state->grid[(y+1)*w+x]==TREE)) (grid[y*w+x] == TENT && grid[(y+1)*w+x] == TREE))
dsf_merge(dsf, y*w+x, (y+1)*w+x); dsf_merge(dsf, y*w+x, (y+1)*w+x);
} }
} }
@ -2024,16 +2024,16 @@ static int *find_errors(game_state *state)
tmp[x] = 0; tmp[x] = 0;
for (x = 0; x < w*h; x++) { for (x = 0; x < w*h; x++) {
y = dsf_canonify(dsf, x); y = dsf_canonify(dsf, x);
if (state->grid[x] == TREE) if (grid[x] == TREE)
tmp[y]++; tmp[y]++;
else if (state->grid[x] == TENT) else if (grid[x] == TENT)
tmp[y]--; tmp[y]--;
} }
/* And highlight any tent belonging to an equivalence class with /* And highlight any tent belonging to an equivalence class with
* a score less than zero. */ * a score less than zero. */
for (x = 0; x < w*h; x++) { for (x = 0; x < w*h; x++) {
y = dsf_canonify(dsf, x); y = dsf_canonify(dsf, x);
if (state->grid[x] == TENT && tmp[y] < 0) if (grid[x] == TENT && tmp[y] < 0)
ret[x] |= 1 << ERR_OVERCOMMITTED; ret[x] |= 1 << ERR_OVERCOMMITTED;
} }
@ -2050,15 +2050,15 @@ static int *find_errors(game_state *state)
/* Construct the equivalence classes. */ /* Construct the equivalence classes. */
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
for (x = 0; x < w-1; x++) { for (x = 0; x < w-1; x++) {
if ((state->grid[y*w+x]==TREE && TENT(state->grid[y*w+x+1])) || if ((grid[y*w+x] == TREE && TENT(grid[y*w+x+1])) ||
(TENT(state->grid[y*w+x]) && state->grid[y*w+x+1]==TREE)) (TENT(grid[y*w+x]) && grid[y*w+x+1] == TREE))
dsf_merge(dsf, y*w+x, y*w+x+1); dsf_merge(dsf, y*w+x, y*w+x+1);
} }
} }
for (y = 0; y < h-1; y++) { for (y = 0; y < h-1; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
if ((state->grid[y*w+x]==TREE && TENT(state->grid[(y+1)*w+x])) || if ((grid[y*w+x] == TREE && TENT(grid[(y+1)*w+x])) ||
(TENT(state->grid[y*w+x]) && state->grid[(y+1)*w+x]==TREE)) (TENT(grid[y*w+x]) && grid[(y+1)*w+x] == TREE))
dsf_merge(dsf, y*w+x, (y+1)*w+x); dsf_merge(dsf, y*w+x, (y+1)*w+x);
} }
} }
@ -2067,16 +2067,16 @@ static int *find_errors(game_state *state)
tmp[x] = 0; tmp[x] = 0;
for (x = 0; x < w*h; x++) { for (x = 0; x < w*h; x++) {
y = dsf_canonify(dsf, x); y = dsf_canonify(dsf, x);
if (state->grid[x] == TREE) if (grid[x] == TREE)
tmp[y]++; tmp[y]++;
else if (TENT(state->grid[x])) else if (TENT(grid[x]))
tmp[y]--; tmp[y]--;
} }
/* And highlight any tree belonging to an equivalence class with /* And highlight any tree belonging to an equivalence class with
* a score more than zero. */ * a score more than zero. */
for (x = 0; x < w*h; x++) { for (x = 0; x < w*h; x++) {
y = dsf_canonify(dsf, x); y = dsf_canonify(dsf, x);
if (state->grid[x] == TREE && tmp[y] > 0) if (grid[x] == TREE && tmp[y] > 0)
ret[x] |= 1 << ERR_OVERCOMMITTED; ret[x] |= 1 << ERR_OVERCOMMITTED;
} }
#undef TENT #undef TENT
@ -2210,6 +2210,7 @@ static void int_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
int x, y, flashing; int x, y, flashing;
int cx = -1, cy = -1; int cx = -1, cy = -1;
int cmoved = 0; int cmoved = 0;
char *tmpgrid;
int *errors; int *errors;
if (ui) { if (ui) {
@ -2244,9 +2245,22 @@ static void int_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
flashing = FALSE; flashing = FALSE;
/* /*
* Find errors. * Find errors. For this we use _part_ of the information from a
* currently active drag: we transform dsx,dsy but not anything
* else. (This seems to strike a good compromise between having
* the error highlights respond instantly to single clicks, but
* not give constant feedback during a right-drag.)
*/ */
errors = find_errors(state); if (ui && ui->drag_button >= 0) {
tmpgrid = snewn(w*h, char);
memcpy(tmpgrid, state->grid, w*h);
tmpgrid[ui->dsy * w + ui->dsx] =
drag_xform(ui, ui->dsx, ui->dsy, tmpgrid[ui->dsy * w + ui->dsx]);
errors = find_errors(state, tmpgrid);
sfree(tmpgrid);
} else {
errors = find_errors(state, state->grid);
}
/* /*
* Draw the grid. * Draw the grid.