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

Forbid impossible moves in Bridges

Browse Source 
Specifically, a bridge or a non-bridge must connect two islands that
differ in precisely one co-ordinate.  Without this, a save file that
tries to connect or disconnect two non-orthogonal islands will cause
"island_join: Assertion `!"island_join: islands not orthogonal."'
failed."

Here's a save file demonstrating the problem:

SAVEFILE:41:Simon Tatham's Portable Puzzle Collection
VERSION :1:1
GAME    :7:Bridges
PARAMS  :13:3x3i30e10m2d0
CPARAMS :13:3x3i30e10m2d0
DESC    :6:b1c1a2
NSTATES :1:2
STATEPOS:1:2
MOVE    :10:L0,2,2,0,1
This commit is contained in:
Ben Harris
2023-02-10 17:09:18 +00:00
parent bd5c0a37a0
commit bf9abb2a12
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridges.c
View File

@ -2571,6 +2571,8 @@ static game_state *execute_move(const game_state *state, const char *move)
goto badmove;
if (!INGRID(ret, x1, y1) || !INGRID(ret, x2, y2))
goto badmove;
/* Precisely one co-ordinate must differ between islands. */
if ((x1 != x2) + (y1 != y2) != 1) goto badmove;
is1 = INDEX(ret, gridi, x1, y1);
is2 = INDEX(ret, gridi, x2, y2);
if (!is1 || !is2) goto badmove;
@ -2582,6 +2584,7 @@ static game_state *execute_move(const game_state *state, const char *move)
goto badmove;
if (!INGRID(ret, x1, y1) || !INGRID(ret, x2, y2))
goto badmove;
if ((x1 != x2) + (y1 != y2) != 1) goto badmove;
is1 = INDEX(ret, gridi, x1, y1);
is2 = INDEX(ret, gridi, x2, y2);
if (!is1 || !is2) goto badmove;