Fix completion checking in Killer Solo.

[sgt-puzzles.git] / galaxies.c

diff --git a/galaxies.c b/galaxies.c
index 330b6bb3d287a399e5f7512a260d178c849c2192..53d6fab2db1bf519229805cdfdca4db102edc21e 100644 (file)
--- a/galaxies.c
+++ b/galaxies.c
@@ -373,7 +373,9 @@ static void add_assoc_with_opposite(game_state *state, space *tile, space *dot)
     }
 
     sfree(colors);
+    remove_assoc_with_opposite(state, tile);
     add_assoc(state, tile, dot);
+    remove_assoc_with_opposite(state, opposite);
     add_assoc(state, opposite, dot);
 }
 
@@ -1299,6 +1301,8 @@ generate:
 
     game_update_dots(state);
 
+    if (state->ndots == 1) goto generate;
+
 #ifdef DEBUGGING
     {
         char *tmp = encode_game(state);
@@ -2589,7 +2593,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (INUI(state, px, py)) {
             sp = &SPACE(state, px, py);
 
-            if (!(sp->flags & F_DOT) && !(sp->flags & F_TILE_ASSOC))
+            if (!(sp->flags & F_DOT))
                sprintf(buf + strlen(buf), "%sA%d,%d,%d,%d",
                        sep, px, py, ui->dotx, ui->doty);
        }