X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/48d70ca96bb91f3e9abef9a0b38ed0a5cbb21d7b..05f411a6b7c20f42a2500df4b70eba70e8ff088b:/midend.c

diff --git a/midend.c b/midend.c
index cacd66e..a9cd768 100644
--- a/midend.c
+++ b/midend.c
@@ -27,8 +27,10 @@ struct midend_data {
     game_state **states;
     game_drawstate *drawstate;
     game_state *oldstate;
+    game_ui *ui;
     float anim_time, anim_pos;
     float flash_time, flash_pos;
+    int dir;
 };
 
 #define ensure(me) do { \
@@ -56,6 +58,8 @@ midend_data *midend_new(frontend *fe, void *randseed, int randseedsize)
     me->npresets = me->presetsize = 0;
     me->anim_time = me->anim_pos = 0.0F;
     me->flash_time = me->flash_pos = 0.0F;
+    me->dir = 0;
+    me->ui = NULL;
 
     return me;
 }
@@ -99,6 +103,9 @@ void midend_new_game(midend_data *me)
     me->states[me->nstates++] = new_game(me->params, me->seed);
     me->statepos = 1;
     me->drawstate = game_new_drawstate(me->states[0]);
+    if (me->ui)
+        free_ui(me->ui);
+    me->ui = new_ui(me->states[0]);
 }
 
 void midend_restart_game(midend_data *me)
@@ -106,12 +113,15 @@ void midend_restart_game(midend_data *me)
     while (me->nstates > 1)
 	free_game(me->states[--me->nstates]);
     me->statepos = me->nstates;
+    free_ui(me->ui);
+    me->ui = new_ui(me->states[0]);
 }
 
 static int midend_undo(midend_data *me)
 {
     if (me->statepos > 1) {
 	me->statepos--;
+        me->dir = -1;
         return 1;
     } else
         return 0;
@@ -121,6 +131,7 @@ static int midend_redo(midend_data *me)
 {
     if (me->statepos < me->nstates) {
 	me->statepos++;
+        me->dir = +1;
         return 1;
     } else
         return 0;
@@ -133,7 +144,8 @@ static void midend_finish_move(midend_data *me)
     if (me->oldstate || me->statepos > 1) {
 	flashtime = game_flash_length(me->oldstate ? me->oldstate :
 				      me->states[me->statepos-2],
-				      me->states[me->statepos-1]);
+				      me->states[me->statepos-1],
+                                      me->oldstate ? me->dir : +1);
 	if (flashtime > 0) {
 	    me->flash_pos = 0.0F;
 	    me->flash_time = flashtime;
@@ -144,6 +156,7 @@ static void midend_finish_move(midend_data *me)
 	free_game(me->oldstate);
     me->oldstate = NULL;
     me->anim_pos = me->anim_time = 0;
+    me->dir = 0;
 
     if (me->flash_time == 0 && me->anim_time == 0)
 	deactivate_timer(me->frontend);
@@ -151,43 +164,61 @@ static void midend_finish_move(midend_data *me)
 	activate_timer(me->frontend);
 }
 
-int midend_process_key(midend_data *me, int x, int y, int button)
+static void midend_stop_anim(midend_data *me)
 {
-    game_state *oldstate = dup_game(me->states[me->statepos - 1]);
-    float anim_time;
-
     if (me->oldstate || me->anim_time) {
 	midend_finish_move(me);
         midend_redraw(me);
     }
+}
+
+int midend_process_key(midend_data *me, int x, int y, int button)
+{
+    game_state *oldstate = dup_game(me->states[me->statepos - 1]);
+    float anim_time;
 
     if (button == 'n' || button == 'N' || button == '\x0E') {
+	midend_stop_anim(me);
 	midend_new_game(me);
         midend_redraw(me);
         return 1;                      /* never animate */
     } else if (button == 'r' || button == 'R') {
+	midend_stop_anim(me);
 	midend_restart_game(me);
         midend_redraw(me);
         return 1;                      /* never animate */
     } else if (button == 'u' || button == 'u' ||
                button == '\x1A' || button == '\x1F') {
+	midend_stop_anim(me);
 	if (!midend_undo(me))
             return 1;
     } else if (button == '\x12') {
+	midend_stop_anim(me);
 	if (!midend_redo(me))
             return 1;
     } else if (button == 'q' || button == 'Q' || button == '\x11') {
 	free_game(oldstate);
         return 0;
     } else {
-        game_state *s = make_move(me->states[me->statepos-1], x, y, button);
-
-        if (s) {
+        game_state *s = make_move(me->states[me->statepos-1], me->ui,
+                                  x, y, button);
+
+        if (s == me->states[me->statepos-1]) {
+            /*
+             * make_move() is allowed to return its input state to
+             * indicate that although no move has been made, the UI
+             * state has been updated and a redraw is called for.
+             */
+            midend_redraw(me);
+            return 1;
+        } else if (s) {
+	    midend_stop_anim(me);
             while (me->nstates > me->statepos)
                 free_game(me->states[--me->nstates]);
             ensure(me);
             me->states[me->nstates] = s;
             me->statepos = ++me->nstates;
+            me->dir = +1;
         } else {
             free_game(oldstate);
             return 1;
@@ -197,7 +228,7 @@ int midend_process_key(midend_data *me, int x, int y, int button)
     /*
      * See if this move requires an animation.
      */
-    anim_time = game_anim_length(oldstate, me->states[me->statepos-1]);
+    anim_time = game_anim_length(oldstate, me->states[me->statepos-1], me->dir);
 
     me->oldstate = oldstate;
     if (anim_time > 0) {
@@ -221,12 +252,14 @@ void midend_redraw(midend_data *me)
         start_draw(me->frontend);
         if (me->oldstate && me->anim_time > 0 &&
             me->anim_pos < me->anim_time) {
+            assert(me->dir != 0);
             game_redraw(me->frontend, me->drawstate, me->oldstate,
-                        me->states[me->statepos-1], me->anim_pos,
-			me->flash_pos);
+                        me->states[me->statepos-1], me->dir,
+                        me->ui, me->anim_pos, me->flash_pos);
         } else {
             game_redraw(me->frontend, me->drawstate, NULL,
-                        me->states[me->statepos-1], 0.0, me->flash_pos);
+                        me->states[me->statepos-1], +1 /*shrug*/,
+                        me->ui, 0.0, me->flash_pos);
         }
         end_draw(me->frontend);
     }
@@ -308,7 +341,7 @@ int midend_wants_statusbar(midend_data *me)
 
 config_item *midend_get_config(midend_data *me, int which, char **wintitle)
 {
-    char *titlebuf;
+    char *titlebuf, *parstr;
     config_item *ret;
 
     titlebuf = snewn(40 + strlen(game_name), char);
@@ -327,7 +360,15 @@ config_item *midend_get_config(midend_data *me, int which, char **wintitle)
 	ret[0].type = C_STRING;
 	ret[0].name = "Game ID";
 	ret[0].ival = 0;
-	ret[0].sval = dupstr(me->seed);
+        /*
+         * The text going in here will be a string encoding of the
+         * parameters, plus a colon, plus the game seed. This is a
+         * full game ID.
+         */
+        parstr = encode_params(me->params);
+        ret[0].sval = snewn(strlen(parstr) + strlen(me->seed) + 2, char);
+        sprintf(ret[0].sval, "%s:%s", parstr, me->seed);
+        sfree(parstr);
 
 	ret[1].type = C_END;
 	ret[1].name = ret[1].sval = NULL;
@@ -340,6 +381,59 @@ config_item *midend_get_config(midend_data *me, int which, char **wintitle)
     return NULL;
 }
 
+char *midend_game_id(midend_data *me, char *id, int def_seed)
+{
+    char *error, *par, *seed;
+    game_params *params;
+
+    seed = strchr(id, ':');
+
+    if (seed) {
+        /*
+         * We have a colon separating parameters from game seed. So
+         * `par' now points to the parameters string, and `seed' to
+         * the seed string.
+         */
+        *seed++ = '\0';
+        par = id;
+    } else {
+        /*
+         * We only have one string. Depending on `def_seed', we
+         * take it to be either parameters or seed.
+         */
+        if (def_seed) {
+            seed = id;
+            par = NULL;
+        } else {
+            seed = NULL;
+            par = id;
+        }
+    }
+
+    if (par) {
+        params = decode_params(par);
+        error = validate_params(params);
+        if (error) {
+            free_params(params);
+            return error;
+        }
+        free_params(me->params);
+        me->params = params;
+    }
+
+    if (seed) {
+        error = validate_seed(me->params, seed);
+        if (error)
+            return error;
+
+        sfree(me->seed);
+        me->seed = dupstr(seed);
+        me->fresh_seed = TRUE;
+    }
+
+    return NULL;
+}
+
 char *midend_set_config(midend_data *me, int which, config_item *cfg)
 {
     char *error;
@@ -360,14 +454,9 @@ char *midend_set_config(midend_data *me, int which, config_item *cfg)
 	break;
 
       case CFG_SEED:
-	error = validate_seed(me->params, cfg[0].sval);
+        error = midend_game_id(me, cfg[0].sval, TRUE);
 	if (error)
 	    return error;
-
-	sfree(me->seed);
-	me->seed = dupstr(cfg[0].sval);
-	me->fresh_seed = TRUE;
-
 	break;
     }