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

Replace TRUE/FALSE with C99 true/false throughout.

Browse Source 
This commit removes the old #defines of TRUE and FALSE from puzzles.h,
and does a mechanical search-and-replace throughout the code to
replace them with the C99 standard lowercase spellings.
This commit is contained in:
Simon Tatham
2018-11-13 21:44:02 +00:00
parent 064da87682
commit a550ea0a47
64 changed files with 2111 additions and 2118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
loopgen.c
View File

@ -84,7 +84,7 @@ static int can_colour_face(grid *g, char* board, int face_index,
grid_dot *starting_dot;
int transitions;
int current_state, s; /* booleans: equal or not-equal to 'colour' */
int found_same_coloured_neighbour = FALSE;
int found_same_coloured_neighbour = false;
assert(board[face_index] != colour);
/* Can only consider a face for colouring if it's adjacent to a face
@ -93,12 +93,12 @@ static int can_colour_face(grid *g, char* board, int face_index,
grid_edge *e = test_face->edges[i];
grid_face *f = (e->face1 == test_face) ? e->face2 : e->face1;
if (FACE_COLOUR(f) == colour) {
found_same_coloured_neighbour = TRUE;
found_same_coloured_neighbour = true;
break;
}
}
if (!found_same_coloured_neighbour)
return FALSE;
return false;
/* Need to avoid creating a loop of faces of this colour around some
* differently-coloured faces.
@ -158,11 +158,11 @@ static int can_colour_face(grid *g, char* board, int face_index,
current_state = (FACE_COLOUR(current_face) == colour);
starting_dot = NULL;
starting_face = NULL;
while (TRUE) {
while (true) {
/* Advance to next face.
* Need to loop here because it might take several goes to
* find it. */
while (TRUE) {
while (true) {
j++;
if (j == test_face->dots[i]->order)
j = 0;
@ -206,7 +206,7 @@ static int can_colour_face(grid *g, char* board, int face_index,
}
}
return (transitions == 2) ? TRUE : FALSE;
return (transitions == 2) ? true : false;
}
/* Count the number of neighbours of 'face', having colour 'colour' */
@ -361,7 +361,7 @@ void generate_loop(grid *g, char *board, random_state *rs,
}
/* Colour faces one at a time until no more faces are colourable. */
while (TRUE)
while (true)
{
enum face_colour colour;
tree234 *faces_to_pick;
@ -501,12 +501,12 @@ void generate_loop(grid *g, char *board, random_state *rs,
* make some illicit deductions. To combat this (and make the path more
* interesting), we do one final pass making random flips. */
/* Set to TRUE for final pass */
do_random_pass = FALSE;
/* Set to true for final pass */
do_random_pass = false;
while (TRUE) {
while (true) {
/* Remember whether a flip occurred during this pass */
int flipped = FALSE;
int flipped = false;
for (i = 0; i < num_faces; ++i) {
int j = face_list[i];
@ -522,14 +522,14 @@ void generate_loop(grid *g, char *board, random_state *rs,
/* normal pass - flip when neighbour count is 1 */
if (face_num_neighbours(g, board, face, opp) == 1) {
board[j] = opp;
flipped = TRUE;
flipped = true;
}
}
}
}
if (do_random_pass) break;
if (!flipped) do_random_pass = TRUE;
if (!flipped) do_random_pass = true;
}
sfree(face_list);