shithub: puzzles

Info  •  Files  •  Log  •  Branches

Galaxies: fix assertion failure when adding out-of-bounds association.

Adding an association with an out-of-bounds square (i.e. by pressing Return
with a dot selected, and then moving the cursor so the `opposite' arrow was
off the screen) would cause space_opposite_dot() to return NULL, in turn
causing ok_to_add_assoc_with_opposite_internal() to return false, failing
the assertion.

This assertion appears to have been introduced in 68363231.

--- a/galaxies.c

+++ b/galaxies.c

@@ -382,12 +382,15 @@

 static void add_assoc_with_opposite(game_state *state, space *tile, space *dot) {

     space *opposite = space_opposite_dot(state, tile, dot);

-    assert(ok_to_add_assoc_with_opposite_internal(state, tile, opposite));

+    if(opposite)

+    {

+        assert(ok_to_add_assoc_with_opposite_internal(state, tile, opposite));

-    remove_assoc_with_opposite(state, tile);

-    add_assoc(state, tile, dot);

-    remove_assoc_with_opposite(state, opposite);

-    add_assoc(state, opposite, dot);

+        remove_assoc_with_opposite(state, tile);

+        add_assoc(state, tile, dot);

+        remove_assoc_with_opposite(state, opposite);

+        add_assoc(state, opposite, dot);

+    }

 }

 static space *sp2dot(const game_state *state, int x, int y)