HTML Help support for Puzzles, with the same kind of automatic

[sgt-puzzles.git] / inertia.c

diff --git a/inertia.c b/inertia.c
index 93345fee5c988cde776c5d7f6b188cbf6d9db106..10ea53856a7ff90ef5a2bd811bb064255574396b 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
@@ -1899,12 +1911,12 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y, int v)
        int coords[8];
 
        coords[0] = tx+TILESIZE/2;
-       coords[1] = ty+TILESIZE*1/7;
-       coords[2] = tx+TILESIZE*1/7;
+       coords[1] = ty+TILESIZE/2-TILESIZE*5/14;
+       coords[2] = tx+TILESIZE/2-TILESIZE*5/14;
        coords[3] = ty+TILESIZE/2;
        coords[4] = tx+TILESIZE/2;
-       coords[5] = ty+TILESIZE-TILESIZE*1/7;
-       coords[6] = tx+TILESIZE-TILESIZE*1/7;
+       coords[5] = ty+TILESIZE/2+TILESIZE*5/14;
+       coords[6] = tx+TILESIZE/2+TILESIZE*5/14;
        coords[7] = ty+TILESIZE/2;
 
        draw_polygon(dr, coords, 4, COL_GEM, COL_OUTLINE);
@@ -2122,11 +2134,6 @@ static float game_flash_length(game_state *oldstate, game_state *newstate,
     return 0.0F;
 }
 
-static int game_wants_statusbar(void)
-{
-    return TRUE;
-}
-
 static int game_timing_state(game_state *state, game_ui *ui)
 {
     return TRUE;
@@ -2145,7 +2152,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 #endif
 
 const struct game thegame = {
-    "Inertia", "games.inertia",
+    "Inertia", "games.inertia", "inertia",
     default_params,
     game_fetch_preset,
     decode_params,
@@ -2176,7 +2183,7 @@ const struct game thegame = {
     game_anim_length,
     game_flash_length,
     FALSE, FALSE, game_print_size, game_print,
-    game_wants_statusbar,
+    TRUE,                             /* wants_statusbar */
     FALSE, game_timing_state,
     0,                                /* flags */
 };