Overzealous last-move tracking during shuffle was causing lockups on

2x2 grid generation.

[originally from svn r5939]

diff --git a/netslide.c b/netslide.c
index 22517f48d0853cd1f3aa051dac3daa1642e24f48..d19bdbb4863a0d5e7873b925a6c4a3657a786bd9 100644 (file)
--- a/netslide.c
+++ b/netslide.c
@@ -582,7 +582,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
                 if (col == prevrowcol) {
                     if (dir == 2-prevdir)
                         continue;   /* undoes last move */
-                    else if ((nrepeats+1)*2 > h)
+                    else if (dir == prevdir && (nrepeats+1)*2 > h)
                         continue;   /* makes fewer moves */
                 }
                 slide_col_int(w, h, tiles, 1 - dir, col);
@@ -593,7 +593,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
                 if (row == prevrowcol) {
                     if (dir == 4-prevdir)
                         continue;   /* undoes last move */
-                    else if ((nrepeats+1)*2 > w)
+                    else if (dir == prevdir && (nrepeats+1)*2 > w)
                         continue;   /* makes fewer moves */
                 }
                 slide_row_int(w, h, tiles, 2 - dir, row);