Bound edge thicknesses below so that they're always thicker than the

[sgt/puzzles] / galaxies.c

diff --git a/galaxies.c b/galaxies.c
index d7a90a4..bfb558d 100644 (file)
--- a/galaxies.c
+++ b/galaxies.c
@@ -298,8 +298,8 @@ static void add_assoc(game_state *state, space *tile, space *dot) {
     tile->dotx = dot->x;
     tile->doty = dot->y;
     dot->nassoc++;
-    debug(("add_assoc sp %d %d --> dot %d,%d, new nassoc %d.\n",
-           tile->x, tile->y, dot->x, dot->y, dot->nassoc));
+    /*debug(("add_assoc sp %d %d --> dot %d,%d, new nassoc %d.\n",
+           tile->x, tile->y, dot->x, dot->y, dot->nassoc));*/
 }
 
 static struct space *sp2dot(game_state *state, int x, int y)
@@ -2075,7 +2075,7 @@ static void game_changed_state(game_ui *ui, game_state *oldstate,
 #define PREFERRED_TILE_SIZE 32
 #define TILE_SIZE (ds->tilesize)
 #define DOT_SIZE        (TILE_SIZE / 4)
-#define EDGE_THICKNESS (TILE_SIZE / 16)
+#define EDGE_THICKNESS (max(TILE_SIZE / 16, 2))
 #define BORDER TILE_SIZE
 
 #define COORD(x) ( (x) * TILE_SIZE + BORDER )
@@ -2205,7 +2205,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
             solver_obvious(tmp);
         else
             solver_state(tmp, DIFF_UNREASONABLE-1);
-        ret = diff_game(state, tmp, 0);
+        ret = diff_game(state, tmp, 1);
         free_game(tmp);
         return ret;
     }
@@ -2594,6 +2594,7 @@ static game_state *execute_move(game_state *state, char *move)
 #endif
         } else if (c == 'S') {
             move++;
+           ret->used_solve = 1;
         } else
             goto badmove;