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

Introduce a new game backend function (there seem to have been a lot

Browse Source 
of these recently) whose job is to update a game_ui to be consistent
with a new game_state. This is called by midend.c in every situation
where the current game_state changes _other_ than as a result of
make_move (Undo, Redo, Restart, Solve).

The introduction of this function allows a game_ui to contain
information about selections or highlights within a game_state which
simply wouldn't make sense when transferred to another game_state.
In particular, I've used it to fix a subtle bug in Solo whereby,
although you couldn't right-click to pencil-mode highlight a filled
square, you could _get_ a pencil-mode highlight in a filled square
if you used Undo and Redo. (Undo to before the square was filled,
right-click to highlight it, then Redo. Alternatively, left-click
and clear the square, right-click to highlight it, then Undo.)

[originally from svn r5912]
This commit is contained in:
Simon Tatham
2005-06-06 11:21:36 +00:00
parent 57b3982c83
commit 69f7e7f8f5
13 changed files with 95 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
solo.c
View File

@ -1853,6 +1853,22 @@ static void free_ui(game_ui *ui)
sfree(ui);
}
static void game_changed_state(game_ui *ui, game_state *oldstate,
game_state *newstate)
{
int c = newstate->c, r = newstate->r, cr = c*r;
/*
* We prevent pencil-mode highlighting of a filled square. So
* if the user has just filled in a square which we had a
* pencil-mode highlight in (by Undo, or by Redo, or by Solve),
* then we cancel the highlight.
*/
if (ui->hx >= 0 && ui->hy >= 0 && ui->hpencil &&
newstate->grid[ui->hy * cr + ui->hx] != 0) {
ui->hx = ui->hy = -1;
}
}
static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
int x, int y, int button)
{
@ -2278,6 +2294,7 @@ const struct game thegame = {
TRUE, game_text_format,
new_ui,
free_ui,
game_changed_state,
make_move,
game_size,
game_colours,