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

Use a dedicated copy function to copy dsfs.

Browse Source 
Previously we were duplicating the contents of a dsf using straight-up
memcpy. Now there's a dsf_copy function wrapping the same memcpy.

For the moment, this still has to take a size parameter, because the
size isn't stored inside the dsf itself. But once we make a proper
data type, it will be.
This commit is contained in:
Simon Tatham
2023-04-20 13:52:13 +01:00
parent bb561ee3b1
commit 11a8149d67
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges.c
View File

@ -1551,7 +1551,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
maxb = -1;
/* We have to squirrel the dsf away and restore it afterwards;
* it is additive only, and can't be removed from. */
memcpy(ss->tmpdsf, ss->dsf, wh*sizeof(int));
dsf_copy(ss->tmpdsf, ss->dsf, wh);
for (n = curr+1; n <= curr+spc; n++) {
solve_join(is, i, n, false);
map_update_possibles(is->state);
@ -1567,7 +1567,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
}
}
solve_join(is, i, curr, false); /* put back to before. */
memcpy(ss->dsf, ss->tmpdsf, wh*sizeof(int));
dsf_copy(ss->dsf, ss->tmpdsf, wh);
if (maxb != -1) {
/*debug_state(is->state);*/
@ -1636,7 +1636,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
is->adj.points[j].dx ? G_LINEH : G_LINEV);
if (before[i] != 0) continue; /* this idea is pointless otherwise */
memcpy(ss->tmpdsf, ss->dsf, wh*sizeof(int));
dsf_copy(ss->tmpdsf, ss->dsf, wh);
for (j = 0; j < is->adj.npoints; j++) {
spc = island_adjspace(is, true, missing, j);
@ -1651,7 +1651,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
for (j = 0; j < is->adj.npoints; j++)
solve_join(is, j, before[j], false);
memcpy(ss->dsf, ss->tmpdsf, wh*sizeof(int));
dsf_copy(ss->dsf, ss->tmpdsf, wh);
if (got) {
debug(("island at (%d,%d) must connect in direction (%d,%d) to"