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

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
unfinished/slide.c
View File

@ -195,7 +195,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 */
@ -221,7 +221,7 @@ static void decode_params(game_params *params, 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];
@ -234,7 +234,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];
@ -267,7 +267,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);
@ -278,7 +278,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)
{
if (params->w > MAXWID)
return "Width must be at most " STR(MAXWID);
@ -891,7 +891,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
return ret;
}
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, wh = w*h;
int *active, *link;
@ -1001,7 +1001,8 @@ static char *validate_desc(const game_params *params, char *desc)
return ret;
}
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, wh = w*h;
game_state *state;
@ -1083,7 +1084,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->w, h = state->h, wh = w*h;
game_state *ret = snew(game_state);
@ -1124,8 +1125,8 @@ static void free_game(game_state *state)
sfree(state);
}
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 *moves;
int nmoves;
@ -1168,12 +1169,12 @@ static char *solve_game(game_state *state, game_state *currstate,
return ret;
}
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)
{
return board_text_format(state->w, state->h, state->board,
state->imm->forcefield);
@ -1188,7 +1189,7 @@ struct game_ui {
int *bfs_queue; /* used as scratch in interpret_move */
};
static game_ui *new_ui(game_state *state)
static game_ui *new_ui(const game_state *state)
{
int w = state->w, h = state->h, wh = w*h;
game_ui *ui = snew(game_ui);
@ -1210,17 +1211,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)
{
}
@ -1242,8 +1243,9 @@ struct game_drawstate {
int started;
};
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->w, h = state->h, wh = w*h;
int tx, ty, i, j;
@ -1458,7 +1460,7 @@ static int move_piece(int w, int h, const unsigned char *src,
return TRUE;
}
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->w, h = state->h /* , wh = w*h */;
char c;
@ -1595,8 +1597,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;
@ -1607,7 +1609,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;
}
@ -1667,7 +1669,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->w, h = state->h, wh = w*h;
struct game_drawstate *ds = snew(struct game_drawstate);
@ -2115,9 +2117,10 @@ static unsigned long find_piecepart(int w, int h, int *dsf, int x, int y)
return val;
}
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->w, h = state->h, wh = w*h;
unsigned char *board;
@ -2277,14 +2280,14 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
sfree(board);
}
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 < 0 && newstate->completed >= 0)
return FLASH_TIME;
@ -2292,21 +2295,21 @@ 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)
{
}
static void game_print(drawing *dr, game_state *state, int tilesize)
static void game_print(drawing *dr, const game_state *state, int tilesize)
{
}