Sync with website

[sgt/puzzles] / samegame.c

diff --git a/samegame.c b/samegame.c
index 35f2ae2..4bb535d 100644 (file)
--- a/samegame.c
+++ b/samegame.c
@@ -209,7 +209,7 @@ static game_params *custom_params(config_item *cfg)
     return ret;
 }
 
-static char *validate_params(game_params *params)
+static char *validate_params(game_params *params, int full)
 {
     if (params->w < 1 || params->h < 1)
        return "Width and height must both be positive";
@@ -291,9 +291,9 @@ static char *validate_desc(game_params *params, char *desc)
        char *q = p;
        int n;
 
-       if (!isdigit(*p))
+       if (!isdigit((unsigned char)*p))
            return "Not enough numbers in string";
-       while (isdigit(*p)) p++;
+       while (isdigit((unsigned char)*p)) p++;
 
        if (i < area-1 && *p != ',')
            return "Expected comma after number";
@@ -429,6 +429,14 @@ static void game_changed_state(game_ui *ui, game_state *oldstate,
                                game_state *newstate)
 {
     sel_clear(ui, newstate);
+
+    /*
+     * If the game state has just changed into an unplayable one
+     * (either completed or impossible), we vanish the keyboard-
+     * control cursor.
+     */
+    if (newstate->complete || newstate->impossible)
+       ui->displaysel = 0;
 }
 
 static char *sel_movedesc(game_ui *ui, game_state *state)
@@ -588,8 +596,6 @@ struct game_drawstate {
     int *tiles; /* contains colour and SELECTED. */
 };
 
-static game_state *execute_move(game_state *from, char *move);
-
 static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
                            int x, int y, int button)
 {
@@ -624,22 +630,8 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
     if (ISSEL(ui,tx,ty)) {
        if (button == RIGHT_BUTTON)
            sel_clear(ui, state);
-       else {
-           game_state *tmp;
-
+       else
            ret = sel_movedesc(ui, state);
-
-           /*
-            * Unfortunately, we must check for completeness or
-            * impossibility now, in order to update the game_ui;
-            * and we can't do that without constructing the new
-            * grid. Sigh.
-            */
-           tmp = execute_move(state, ret);
-           if (tmp->complete || tmp->impossible)
-               ui->displaysel = 0;
-           free_game(tmp);
-       }
     } else {
        sel_clear(ui, state); /* might be no-op */
        sel_expand(ui, state, tx, ty);
@@ -955,7 +947,7 @@ static int game_wants_statusbar(void)
     return TRUE;
 }
 
-static int game_timing_state(game_state *state)
+static int game_timing_state(game_state *state, game_ui *ui)
 {
     return TRUE;
 }