From ce237a73ee2c4a4e0d79f6719f756a6debc4caf0 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 16 Nov 2008 15:28:28 +0000 Subject: [PATCH] Couple of solving-related mid-end tweaks. Firstly, when we generate a game which comes with an aux string, we immediately self-test that string by passing it to solve() and test by assertion that it succeeded. So a bug in a back end which intermittently generates malformed aux strings will be detected as soon as it occurs, instead of only if the user happens to use the Solve operation on a particular game in which it happened. Secondly, Ctrl-S now (undocumentedly) triggers the Solve operation, on the general principle that keyboard shortcuts tend to come in handy, and on the specific principle that if you want to look at lots of solved grids in quick succession (say, when observing their general shape and nature to see if your generation algorithm was good or not) it's handy to have a quick way of getting to them. [originally from svn r8298] --- midend.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/midend.c b/midend.c index 5229935..22d823b 100644 --- a/midend.c +++ b/midend.c @@ -383,6 +383,25 @@ void midend_new_game(midend *me) me->states[me->nstates].state = me->ourgame->new_game(me, me->params, me->desc); + /* + * As part of our commitment to self-testing, test the aux + * string to make sure nothing ghastly went wrong. + */ + if (me->ourgame->can_solve && me->aux_info) { + game_state *s; + char *msg, *movestr; + + msg = NULL; + movestr = me->ourgame->solve(me->states[0].state, + me->states[0].state, + me->aux_info, &msg); + assert(movestr && !msg); + s = me->ourgame->execute_move(me->states[0].state, movestr); + assert(s); + me->ourgame->free_game(s); + sfree(movestr); + } + me->states[me->nstates].movestr = NULL; me->states[me->nstates].movetype = NEWGAME; me->nstates++; @@ -538,6 +557,9 @@ static int midend_really_process_key(midend *me, int x, int y, int button) midend_stop_anim(me); if (!midend_redo(me)) goto done; + } else if (button == '\x13' && me->ourgame->can_solve) { + if (midend_solve(me)) + goto done; } else if (button == 'q' || button == 'Q' || button == '\x11') { ret = 0; goto done; -- 2.30.2