Add Dominosa printout support.

[sgt/puzzles] / midend.c

diff --git a/midend.c b/midend.c
index b5efda6..909368c 100644 (file)
--- a/midend.c
+++ b/midend.c
@@ -237,7 +237,8 @@ void midend_set_params(midend_data *me, game_params *params)
 static void midend_set_timer(midend_data *me)
 {
     me->timing = (me->ourgame->is_timed &&
-                 me->ourgame->timing_state(me->states[me->statepos-1].state));
+                 me->ourgame->timing_state(me->states[me->statepos-1].state,
+                                           me->ui));
     if (me->timing || me->flash_time || me->anim_time)
        activate_timer(me->frontend);
     else
@@ -311,10 +312,10 @@ void midend_new_game(midend_data *me)
     me->drawstate = me->ourgame->new_drawstate(me->states[0].state);
     midend_size_new_drawstate(me);
     me->elapsed = 0.0F;
-    midend_set_timer(me);
     if (me->ui)
         me->ourgame->free_ui(me->ui);
     me->ui = me->ourgame->new_ui(me->states[0].state);
+    midend_set_timer(me);
     me->pressed_mouse_button = 0;
 }
 
@@ -381,7 +382,7 @@ static void midend_finish_move(midend_data *me)
 
 void midend_stop_anim(midend_data *me)
 {
-    if (me->oldstate || me->anim_time) {
+    if (me->oldstate || me->anim_time != 0) {
        midend_finish_move(me);
         midend_redraw(me);
     }
@@ -491,6 +492,10 @@ static int midend_really_process_key(midend_data *me, int x, int y, int button)
             me->states[me->nstates].movetype = MOVE;
             me->statepos = ++me->nstates;
             me->dir = +1;
+           if (me->ui)
+               me->ourgame->changed_state(me->ui,
+                                          me->states[me->statepos-2].state,
+                                          me->states[me->statepos-1].state);
         } else {
             goto done;
         }
@@ -789,7 +794,7 @@ int midend_num_presets(midend_data *me)
                 preset = me->ourgame->default_params();
                 me->ourgame->decode_params(preset, val);
 
-               if (me->ourgame->validate_params(preset)) {
+               if (me->ourgame->validate_params(preset, TRUE)) {
                    /* Drop this one from the list. */
                    me->ourgame->free_params(preset);
                    continue;
@@ -955,7 +960,7 @@ static char *midend_game_id_int(midend_data *me, char *id, int defmode)
     if (par) {
         newcurparams = me->ourgame->dup_params(me->params);
         me->ourgame->decode_params(newcurparams, par);
-        error = me->ourgame->validate_params(newcurparams);
+        error = me->ourgame->validate_params(newcurparams, desc == NULL);
         if (error) {
             me->ourgame->free_params(newcurparams);
             return error;
@@ -1046,7 +1051,7 @@ char *midend_set_config(midend_data *me, int which, config_item *cfg)
     switch (which) {
       case CFG_SETTINGS:
        params = me->ourgame->custom_params(cfg);
-       error = me->ourgame->validate_params(params);
+       error = me->ourgame->validate_params(params, TRUE);
 
        if (error) {
            me->ourgame->free_params(params);
@@ -1350,6 +1355,7 @@ char *midend_deserialise(midend_data *me,
         if (key[8] != ':') {
             if (started)
                 ret = "Data was incorrectly formatted for a saved game file";
+           goto cleanup;
         }
         len = strcspn(key, ": ");
         assert(len <= 8);
@@ -1480,16 +1486,24 @@ char *midend_deserialise(midend_data *me,
 
     params = me->ourgame->default_params();
     me->ourgame->decode_params(params, parstr);
-    if (me->ourgame->validate_params(params)) {
+    if (me->ourgame->validate_params(params, TRUE)) {
         ret = "Long-term parameters in save file are invalid";
         goto cleanup;
     }
     cparams = me->ourgame->default_params();
     me->ourgame->decode_params(cparams, cparstr);
-    if (me->ourgame->validate_params(cparams)) {
+    if (me->ourgame->validate_params(cparams, FALSE)) {
         ret = "Short-term parameters in save file are invalid";
         goto cleanup;
     }
+    if (seed && me->ourgame->validate_params(cparams, TRUE)) {
+        /*
+         * The seed's no use with this version, but we can perfectly
+         * well use the rest of the data.
+         */
+        sfree(seed);
+        seed = NULL;
+    }
     if (!desc) {
         ret = "Game description in save file is missing";
         goto cleanup;