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

Giant const patch of doom: add a 'const' to every parameter in every

Browse Source 
puzzle backend function which ought to have it, and propagate those
consts through to per-puzzle subroutines as needed.

I've recently had to do that to a few specific parameters which were
being misused by particular puzzles (r9657, r9830), which suggests
that it's probably a good idea to do the whole lot pre-emptively
before the next such problem shows up.

[originally from svn r9832]
[r9657 == 3b250baa02a7332510685948bf17576c397b8ceb]
[r9830 == 0b93de904a98f119b1a95d3a53029f1ed4bfb9b3]
This commit is contained in:
Simon Tatham
2013-04-13 10:37:32 +00:00
parent 339329449f
commit 251b21c418
45 changed files with 1856 additions and 1655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
slant.c
View File

@ -137,7 +137,7 @@ static void free_params(game_params *params)
sfree(params);
}
static game_params *dup_params(game_params *params)
static game_params *dup_params(const game_params *params)
{
game_params *ret = snew(game_params);
*ret = *params; /* structure copy */
@ -163,7 +163,7 @@ static void decode_params(game_params *ret, char const *string)
}
}
static char *encode_params(game_params *params, int full)
static char *encode_params(const game_params *params, int full)
{
char data[256];
@ -174,7 +174,7 @@ static char *encode_params(game_params *params, int full)
return dupstr(data);
}
static config_item *game_configure(game_params *params)
static config_item *game_configure(const game_params *params)
{
config_item *ret;
char buf[80];
@ -206,7 +206,7 @@ static config_item *game_configure(game_params *params)
return ret;
}
static game_params *custom_params(config_item *cfg)
static game_params *custom_params(const config_item *cfg)
{
game_params *ret = snew(game_params);
@ -217,7 +217,7 @@ static game_params *custom_params(config_item *cfg)
return ret;
}
static char *validate_params(game_params *params, int full)
static char *validate_params(const game_params *params, int full)
{
/*
* (At least at the time of writing this comment) The grid
@ -1216,7 +1216,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
return desc;
}
static char *validate_desc(const game_params *params, char *desc)
static char *validate_desc(const game_params *params, const char *desc)
{
int w = params->w, h = params->h, W = w+1, H = h+1;
int area = W*H;
@ -1241,7 +1241,8 @@ static char *validate_desc(const game_params *params, char *desc)
return NULL;
}
static game_state *new_game(midend *me, game_params *params, char *desc)
static game_state *new_game(midend *me, const game_params *params,
const char *desc)
{
int w = params->w, h = params->h, W = w+1, H = h+1;
game_state *state = snew(game_state);
@ -1276,7 +1277,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
return state;
}
static game_state *dup_game(game_state *state)
static game_state *dup_game(const game_state *state)
{
int w = state->p.w, h = state->p.h, W = w+1, H = h+1;
game_state *ret = snew(game_state);
@ -1484,8 +1485,8 @@ static int check_completion(game_state *state)
return TRUE;
}
static char *solve_game(game_state *state, game_state *currstate,
char *aux, char **error)
static char *solve_game(const game_state *state, const game_state *currstate,
const char *aux, char **error)
{
int w = state->p.w, h = state->p.h;
signed char *soln;
@ -1549,12 +1550,12 @@ static char *solve_game(game_state *state, game_state *currstate,
return move;
}
static int game_can_format_as_text_now(game_params *params)
static int game_can_format_as_text_now(const game_params *params)
{
return TRUE;
}
static char *game_text_format(game_state *state)
static char *game_text_format(const game_state *state)
{
int w = state->p.w, h = state->p.h, W = w+1, H = h+1;
int x, y, len;
@ -1600,7 +1601,7 @@ struct game_ui {
int cur_x, cur_y, cur_visible;
};
static game_ui *new_ui(game_state *state)
static game_ui *new_ui(const game_state *state)
{
game_ui *ui = snew(game_ui);
ui->cur_x = ui->cur_y = ui->cur_visible = 0;
@ -1612,17 +1613,17 @@ static void free_ui(game_ui *ui)
sfree(ui);
}
static char *encode_ui(game_ui *ui)
static char *encode_ui(const game_ui *ui)
{
return NULL;
}
static void decode_ui(game_ui *ui, char *encoding)
static void decode_ui(game_ui *ui, const char *encoding)
{
}
static void game_changed_state(game_ui *ui, game_state *oldstate,
game_state *newstate)
static void game_changed_state(game_ui *ui, const game_state *oldstate,
const game_state *newstate)
{
}
@ -1666,8 +1667,9 @@ struct game_drawstate {
long *todraw;
};
static char *interpret_move(game_state *state, game_ui *ui, const game_drawstate *ds,
int x, int y, int button)
static char *interpret_move(const game_state *state, game_ui *ui,
const game_drawstate *ds,
int x, int y, int button)
{
int w = state->p.w, h = state->p.h;
int v;
@ -1742,7 +1744,7 @@ static char *interpret_move(game_state *state, game_ui *ui, const game_drawstate
return NULL;
}
static game_state *execute_move(game_state *state, char *move)
static game_state *execute_move(const game_state *state, const char *move)
{
int w = state->p.w, h = state->p.h;
char c;
@ -1789,8 +1791,8 @@ static game_state *execute_move(game_state *state, char *move)
* Drawing routines.
*/
static void game_compute_size(game_params *params, int tilesize,
int *x, int *y)
static void game_compute_size(const game_params *params, int tilesize,
int *x, int *y)
{
/* fool the macros */
struct dummy { int tilesize; } dummy, *ds = &dummy;
@ -1801,7 +1803,7 @@ static void game_compute_size(game_params *params, int tilesize,
}
static void game_set_size(drawing *dr, game_drawstate *ds,
game_params *params, int tilesize)
const game_params *params, int tilesize)
{
ds->tilesize = tilesize;
}
@ -1841,7 +1843,7 @@ static float *game_colours(frontend *fe, int *ncolours)
return ret;
}
static game_drawstate *game_new_drawstate(drawing *dr, game_state *state)
static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
{
int w = state->p.w, h = state->p.h;
int i;
@ -1974,9 +1976,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, game_clues *clues,
draw_update(dr, COORD(x), COORD(y), TILESIZE, TILESIZE);
}
static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
game_state *state, int dir, game_ui *ui,
float animtime, float flashtime)
static void game_redraw(drawing *dr, game_drawstate *ds,
const game_state *oldstate, const game_state *state,
int dir, const game_ui *ui,
float animtime, float flashtime)
{
int w = state->p.w, h = state->p.h, W = w+1, H = h+1;
int x, y;
@ -2063,14 +2066,14 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
}
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
int dir, game_ui *ui)
static float game_anim_length(const game_state *oldstate,
const game_state *newstate, int dir, game_ui *ui)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
int dir, game_ui *ui)
static float game_flash_length(const game_state *oldstate,
const game_state *newstate, int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->used_solve && !newstate->used_solve)
@ -2079,17 +2082,17 @@ static float game_flash_length(game_state *oldstate, game_state *newstate,
return 0.0F;
}
static int game_status(game_state *state)
static int game_status(const game_state *state)
{
return state->completed ? +1 : 0;
}
static int game_timing_state(game_state *state, game_ui *ui)
static int game_timing_state(const game_state *state, game_ui *ui)
{
return TRUE;
}
static void game_print_size(game_params *params, float *x, float *y)
static void game_print_size(const game_params *params, float *x, float *y)
{
int pw, ph;
@ -2101,7 +2104,7 @@ static void game_print_size(game_params *params, float *x, float *y)
*y = ph / 100.0F;
}
static void game_print(drawing *dr, game_state *state, int tilesize)
static void game_print(drawing *dr, const game_state *state, int tilesize)
{
int w = state->p.w, h = state->p.h, W = w+1;
int ink = print_mono_colour(dr, 0);