I've just noticed a bug in the Inertia solver: if you call it on an

already-solved grid (i.e. no gems), it will still attempt to show
you a move you can make. Eliminate that special case.

[originally from svn r6507]

diff --git a/inertia.c b/inertia.c
index a1ad50ab18cc80a26f92772de447a2e6ee9163da..6531b9845e86f42e559a30669c83b5ab47a4567a 100644 (file)
--- a/inertia.c
+++ b/inertia.c
@@ -734,6 +734,18 @@ static char *solve_game(game_state *state, game_state *currstate,
     int head, tail, pass, i, j, n, x, y, d, dd;
     char *err, *soln, *p;
 
+    /*
+     * Before anything else, deal with the special case in which
+     * all the gems are already collected.
+     */
+    for (i = 0; i < wh; i++)
+       if (currstate->grid[i] == GEM)
+           break;
+    if (i == wh) {
+       *error = "Game is already solved";
+       return NULL;
+    }
+
     /*
      * Solving Inertia is a question of first building up the graph
      * of where you can get to from where, and secondly finding a