zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail an assertion when setting up the provided clues at the

Browse Source 
start of the solver, if they contradict each other. (Could trigger on
user-provided grids.)

[originally from svn r9594]
This commit is contained in:
Simon Tatham
2012-07-29 21:29:26 +00:00
parent 6567260eb0
commit bbf800e49e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
solo.c
View File

@ -1773,9 +1773,16 @@ static void solver(int cr, struct block_structure *blocks,
* Place all the clue numbers we are given. * Place all the clue numbers we are given.
*/ */
for (x = 0; x < cr; x++) for (x = 0; x < cr; x++)
for (y = 0; y < cr; y++) for (y = 0; y < cr; y++) {
if (grid[y*cr+x]) int n = grid[y*cr+x];
if (n) {
if (!cube(x,y,n)) {
diff = DIFF_IMPOSSIBLE;
goto got_result;
}
solver_place(usage, x, y, grid[y*cr+x]); solver_place(usage, x, y, grid[y*cr+x]);
}
}
/* /*
* Now loop over the grid repeatedly trying all permitted modes * Now loop over the grid repeatedly trying all permitted modes