zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 00:15:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Overzealous last-move tracking during shuffle was causing lockups on

Browse Source 
2x2 grid generation.

[originally from svn r5939]
This commit is contained in:
Simon Tatham
2005-06-10 11:29:59 +00:00
parent 98c90052c9
commit 363dadee0c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netslide.c
View File

@ -582,7 +582,7 @@ static char *new_game_desc(game_params *params, random_state *rs,
if (col == prevrowcol) { if (col == prevrowcol) {
if (dir == 2-prevdir) if (dir == 2-prevdir)
continue; /* undoes last move */ continue; /* undoes last move */
else if ((nrepeats+1)*2 > h) else if (dir == prevdir && (nrepeats+1)*2 > h)
continue; /* makes fewer moves */ continue; /* makes fewer moves */
} }
slide_col_int(w, h, tiles, 1 - dir, col); 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 (row == prevrowcol) {
if (dir == 4-prevdir) if (dir == 4-prevdir)
continue; /* undoes last move */ continue; /* undoes last move */
else if ((nrepeats+1)*2 > w) else if (dir == prevdir && (nrepeats+1)*2 > w)
continue; /* makes fewer moves */ continue; /* makes fewer moves */
} }
slide_row_int(w, h, tiles, 2 - dir, row); slide_row_int(w, h, tiles, 2 - dir, row);