From: Simon Tatham <anakin@pobox.com>
Date: Wed, 9 Oct 2013 20:44:51 +0000 (+0000)
Subject: Fix an edge case of divider-obsoletion in Group.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=cdc1224233dc2c0de2605d9a555d98b13245f513;p=sgt-puzzles.git

Fix an edge case of divider-obsoletion in Group.

When you drag group elements around, previous dividers are meant to
dissolve whenever the same two elements are no longer on each side of
it. One case in which this didn't happen was that of dragging an
element from the left of a divider to the far right column - the
divider became invisible, but would then startlingly reappear if you
drag that element back to the left of whatever it was left of before.

[originally from svn r10051]
---

diff --git a/unfinished/group.c b/unfinished/group.c
index 74a63fc..c303326 100644
--- a/unfinished/group.c
+++ b/unfinished/group.c
@@ -1430,8 +1430,9 @@ static game_state *execute_move(const game_state *from, const char *move)
         /*
          * Eliminate any obsoleted dividers.
          */
-        for (x = 0; x+1 < w; x++) {
-            int i = ret->sequence[x], j = ret->sequence[x+1];
+        for (x = 0; x < w; x++) {
+            int i = ret->sequence[x];
+            int j = (x+1 < w ? ret->sequence[x+1] : -1);
             if (ret->dividers[i] != j)
                 ret->dividers[i] = -1;
         }