zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Declare all dsfs as a dedicated type name 'DSF'.

Browse Source 
In this commit, 'DSF' is simply a typedef for 'int', so that the new
declaration form 'DSF *' translates to the same type 'int *' that dsfs
have always had. So all we're doing here is mechanically changing type
declarations throughout the code.
This commit is contained in:
Simon Tatham
2023-04-20 14:06:43 +01:00
parent 7abf85a9c6
commit 89c438e149
24 changed files with 122 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unfinished/separate.c
View File

@ -189,7 +189,7 @@ struct solver_scratch {
/*
* Tracks connectedness between squares.
*/
int *dsf;
DSF *dsf;
/*
* size[dsf_canonify(dsf, yx)] tracks the size of the
@ -514,7 +514,7 @@ static unsigned char *generate(int w, int h, int k, random_state *rs)
gen_lock = snewn(wh, bool);
do {
int *dsf = divvy_rectangle(w, h, k, rs);
DSF *dsf = divvy_rectangle(w, h, k, rs);
/*
* Go through the dsf and find the indices of all the

8
unfinished/slide.c
View File

@ -294,7 +294,7 @@ static char *board_text_format(int w, int h, unsigned char *data,
bool *forcefield)
{
int wh = w*h;
int *dsf = snew_dsf(wh);
DSF *dsf = snew_dsf(wh);
int i, x, y;
int retpos, retlen = (w*2+2)*(h*2+1)+1;
char *ret = snewn(retlen, char);
@ -648,7 +648,7 @@ static void generate_board(int w, int h, int *rtx, int *rty, int *minmoves,
unsigned char *board, *board2;
bool *forcefield;
bool *tried_merge;
int *dsf;
DSF *dsf;
int *list, nlist, pos;
int tx, ty;
int i, j;
@ -2083,7 +2083,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds,
draw_update(dr, tx, ty, TILESIZE, TILESIZE);
}
static unsigned long find_piecepart(int w, int h, int *dsf, int x, int y)
static unsigned long find_piecepart(int w, int h, DSF *dsf, int x, int y)
{
int i = y*w+x;
int canon = dsf_canonify(dsf, i);
@ -2119,7 +2119,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
{
int w = state->w, h = state->h, wh = w*h;
unsigned char *board;
int *dsf;
DSF *dsf;
int x, y, mainanchor, mainpos, dragpos, solvepos, solvesrc, solvedst;
/*