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

Galaxies: prevent creation of empty undo-chain items.

Browse Source 
If you drag an arrow on to a square which is already filled in as part
of a completed region, or whose counterpart is filled in, or whose
counterpart is actually a dot, then the game can't actually place a
double arrow. Previously, it didn't find that out until execute_move
time, at which point it was too late to prevent a no-op action from
being placed on the undo chain.

Now we do those checks in interpret_move, before generating the move
string that tries to place the double arrow in the first place. So
execute_move can now enforce by assertion that arrow-placement moves
it gets are valid.
This commit is contained in:
Simon Tatham
2019-02-18 21:12:16 +00:00
parent 1ba4e37228
commit 68363231f0
1 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
galaxies.c
View File

@ -346,29 +346,44 @@ static void add_assoc(const game_state *state, space *tile, space *dot) {
tile->x, tile->y, dot->x, dot->y, dot->nassoc));*/ tile->x, tile->y, dot->x, dot->y, dot->nassoc));*/
} }
static void add_assoc_with_opposite(game_state *state, space *tile, space *dot) { static bool ok_to_add_assoc_with_opposite_internal(
const game_state *state, space *tile, space *opposite)
{
int *colors; int *colors;
space *opposite = space_opposite_dot(state, tile, dot); bool toret;
if (opposite == NULL) { if (tile->flags & F_DOT)
return; return false;
} if (opposite == NULL)
if (opposite->flags & F_DOT) { return false;
return; if (opposite->flags & F_DOT)
} return false;
toret = true;
colors = snewn(state->w * state->h, int); colors = snewn(state->w * state->h, int);
check_complete(state, NULL, colors); check_complete(state, NULL, colors);
if (colors[(tile->y - 1)/2 * state->w + (tile->x - 1)/2]) {
sfree(colors); if (colors[(tile->y - 1)/2 * state->w + (tile->x - 1)/2])
return; toret = false;
} if (colors[(opposite->y - 1)/2 * state->w + (opposite->x - 1)/2])
if (colors[(opposite->y - 1)/2 * state->w + (opposite->x - 1)/2]) { toret = false;
sfree(colors);
return;
}
sfree(colors); sfree(colors);
return toret;
}
static bool ok_to_add_assoc_with_opposite(
const game_state *state, space *tile, space *dot)
{
space *opposite = space_opposite_dot(state, tile, dot);
return ok_to_add_assoc_with_opposite_internal(state, tile, opposite);
}
static void add_assoc_with_opposite(game_state *state, space *tile, space *dot) {
space *opposite = space_opposite_dot(state, tile, dot);
assert(ok_to_add_assoc_with_opposite_internal(state, tile, opposite));
remove_assoc_with_opposite(state, tile); remove_assoc_with_opposite(state, tile);
add_assoc(state, tile, dot); add_assoc(state, tile, dot);
remove_assoc_with_opposite(state, opposite); remove_assoc_with_opposite(state, opposite);
@ -2596,8 +2611,15 @@ static char *interpret_move(const game_state *state, game_ui *ui,
*/ */
if (INUI(state, px, py)) { if (INUI(state, px, py)) {
sp = &SPACE(state, px, py); sp = &SPACE(state, px, py);
dot = &SPACE(state, ui->dotx, ui->doty);
if (!(sp->flags & F_DOT)) /*
* Exception: if it's not actually legal to add an arrow
* and its opposite at this position, we don't try,
* because otherwise we'd append an empty entry to the
* undo chain.
*/
if (ok_to_add_assoc_with_opposite(state, sp, dot))
sprintf(buf + strlen(buf), "%sA%d,%d,%d,%d", sprintf(buf + strlen(buf), "%sA%d,%d,%d,%d",
sep, px, py, ui->dotx, ui->doty); sep, px, py, ui->dotx, ui->doty);
} }