mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-22 16:32:13 -07:00
Giant const patch of doom: add a 'const' to every parameter in every
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
@ -150,7 +150,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 */
|
||||
@ -188,7 +188,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 ret[80];
|
||||
|
||||
@ -201,7 +201,7 @@ static char *encode_params(game_params *params, int full)
|
||||
return dupstr(ret);
|
||||
}
|
||||
|
||||
static config_item *game_configure(game_params *params)
|
||||
static config_item *game_configure(const game_params *params)
|
||||
{
|
||||
config_item *ret;
|
||||
char buf[80];
|
||||
@ -232,7 +232,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);
|
||||
|
||||
@ -243,7 +243,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 < 3 || params->w > 26)
|
||||
return "Grid size must be between 3 and 26";
|
||||
@ -810,7 +810,7 @@ static char *validate_grid_desc(const char **pdesc, int range, int area)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
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, a = w*w;
|
||||
const char *p = desc;
|
||||
@ -818,7 +818,7 @@ static char *validate_desc(const game_params *params, char *desc)
|
||||
return validate_grid_desc(&p, w, a);
|
||||
}
|
||||
|
||||
static char *spec_to_grid(char *desc, digit *grid, int area)
|
||||
static const char *spec_to_grid(const char *desc, digit *grid, int area)
|
||||
{
|
||||
int i = 0;
|
||||
while (*desc && *desc != ',') {
|
||||
@ -843,7 +843,8 @@ static char *spec_to_grid(char *desc, digit *grid, int area)
|
||||
return desc;
|
||||
}
|
||||
|
||||
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, a = w*w;
|
||||
game_state *state = snew(game_state);
|
||||
@ -875,7 +876,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->par.w, a = w*w;
|
||||
game_state *ret = snew(game_state);
|
||||
@ -908,8 +909,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 w = state->par.w, a = w*w;
|
||||
int i, ret;
|
||||
@ -942,12 +943,12 @@ static char *solve_game(game_state *state, game_state *currstate,
|
||||
return out;
|
||||
}
|
||||
|
||||
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->par.w;
|
||||
int x, y;
|
||||
@ -1015,7 +1016,7 @@ struct game_ui {
|
||||
int edgepos;
|
||||
};
|
||||
|
||||
static game_ui *new_ui(game_state *state)
|
||||
static game_ui *new_ui(const game_state *state)
|
||||
{
|
||||
game_ui *ui = snew(game_ui);
|
||||
|
||||
@ -1031,17 +1032,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)
|
||||
{
|
||||
int w = newstate->par.w;
|
||||
/*
|
||||
@ -1093,7 +1094,7 @@ struct game_drawstate {
|
||||
digit *sequence;
|
||||
};
|
||||
|
||||
static int check_errors(game_state *state, long *errors)
|
||||
static int check_errors(const game_state *state, long *errors)
|
||||
{
|
||||
int w = state->par.w, a = w*w;
|
||||
digit *grid = state->grid;
|
||||
@ -1213,8 +1214,9 @@ static int find_in_sequence(digit *seq, int len, digit n)
|
||||
return -1;
|
||||
}
|
||||
|
||||
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->par.w;
|
||||
int tx, ty;
|
||||
@ -1353,7 +1355,7 @@ static char *interpret_move(game_state *state, game_ui *ui,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static game_state *execute_move(game_state *from, char *move)
|
||||
static game_state *execute_move(const game_state *from, const char *move)
|
||||
{
|
||||
int w = from->par.w, a = w*w;
|
||||
game_state *ret;
|
||||
@ -1451,8 +1453,8 @@ static game_state *execute_move(game_state *from, char *move)
|
||||
|
||||
#define SIZE(w) ((w) * TILESIZE + 2*BORDER + LEGEND)
|
||||
|
||||
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)
|
||||
{
|
||||
/* Ick: fake up `ds->tilesize' for macro expansion purposes */
|
||||
struct { int tilesize; } ads, *ds = &ads;
|
||||
@ -1462,7 +1464,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;
|
||||
}
|
||||
@ -1497,7 +1499,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->par.w, a = w*w;
|
||||
struct game_drawstate *ds = snew(struct game_drawstate);
|
||||
@ -1703,9 +1705,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y, long tile,
|
||||
draw_update(dr, cx, cy, cw, ch);
|
||||
}
|
||||
|
||||
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->par.w /*, a = w*w */;
|
||||
int x, y, i, j;
|
||||
@ -1814,14 +1817,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->cheated && !newstate->cheated)
|
||||
@ -1829,19 +1832,19 @@ 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)
|
||||
{
|
||||
if (state->completed)
|
||||
return FALSE;
|
||||
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;
|
||||
|
||||
@ -1853,7 +1856,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->par.w;
|
||||
int ink = print_mono_colour(dr, 0);
|
||||
|
||||
@ -130,7 +130,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 */
|
||||
@ -153,24 +153,24 @@ 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 buf[256];
|
||||
sprintf(buf, "%dx%dn%d", params->w, params->h, params->k);
|
||||
return dupstr(buf);
|
||||
}
|
||||
|
||||
static config_item *game_configure(game_params *params)
|
||||
static config_item *game_configure(const game_params *params)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static game_params *custom_params(config_item *cfg)
|
||||
static game_params *custom_params(const config_item *cfg)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static char *validate_params(game_params *params, int full)
|
||||
static char *validate_params(const game_params *params, int full)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@ -646,12 +646,13 @@ 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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
game_state *state = snew(game_state);
|
||||
|
||||
@ -660,7 +661,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)
|
||||
{
|
||||
game_state *ret = snew(game_state);
|
||||
|
||||
@ -674,23 +675,23 @@ 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)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
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 NULL;
|
||||
}
|
||||
|
||||
static game_ui *new_ui(game_state *state)
|
||||
static game_ui *new_ui(const game_state *state)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@ -699,17 +700,17 @@ static void free_ui(game_ui *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)
|
||||
{
|
||||
}
|
||||
|
||||
@ -718,13 +719,14 @@ struct game_drawstate {
|
||||
int FIXME;
|
||||
};
|
||||
|
||||
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)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static game_state *execute_move(game_state *state, char *move)
|
||||
static game_state *execute_move(const game_state *state, const char *move)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@ -733,14 +735,14 @@ 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)
|
||||
{
|
||||
*x = *y = 10 * tilesize; /* FIXME */
|
||||
}
|
||||
|
||||
static void game_set_size(drawing *dr, game_drawstate *ds,
|
||||
game_params *params, int tilesize)
|
||||
const game_params *params, int tilesize)
|
||||
{
|
||||
ds->tilesize = tilesize;
|
||||
}
|
||||
@ -755,7 +757,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)
|
||||
{
|
||||
struct game_drawstate *ds = snew(struct game_drawstate);
|
||||
|
||||
@ -770,9 +772,10 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
|
||||
sfree(ds);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
/*
|
||||
* The initial contents of the window are not guaranteed and
|
||||
@ -783,33 +786,33 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
|
||||
draw_rect(dr, 0, 0, 10*ds->tilesize, 10*ds->tilesize, COL_BACKGROUND);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
return 0.0F;
|
||||
}
|
||||
|
||||
static int game_status(game_state *state)
|
||||
static int game_status(const game_state *state)
|
||||
{
|
||||
return 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)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -149,7 +149,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 */
|
||||
@ -191,7 +191,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];
|
||||
|
||||
@ -200,7 +200,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];
|
||||
@ -227,7 +227,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);
|
||||
|
||||
@ -237,7 +237,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 < 4 || params->h < 4)
|
||||
return "Width and height must both be at least 4";
|
||||
@ -806,7 +806,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;
|
||||
int area = 0;
|
||||
@ -843,7 +843,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;
|
||||
game_state *state = snew(game_state);
|
||||
@ -880,7 +881,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;
|
||||
game_state *ret = snew(game_state);
|
||||
@ -901,23 +902,23 @@ 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)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
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 NULL;
|
||||
}
|
||||
|
||||
static game_ui *new_ui(game_state *state)
|
||||
static game_ui *new_ui(const game_state *state)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@ -926,17 +927,17 @@ static void free_ui(game_ui *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)
|
||||
{
|
||||
}
|
||||
|
||||
@ -1041,8 +1042,9 @@ int move_type(game_state *state, int dx, int dy)
|
||||
}
|
||||
}
|
||||
|
||||
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 dx=0, dy=0;
|
||||
char *move;
|
||||
@ -1097,7 +1099,7 @@ static char *interpret_move(game_state *state, game_ui *ui,
|
||||
return move;
|
||||
}
|
||||
|
||||
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;
|
||||
int px = state->px, py = state->py;
|
||||
@ -1183,8 +1185,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)
|
||||
{
|
||||
/* Ick: fake up `ds->tilesize' for macro expansion purposes */
|
||||
struct { int tilesize; } ads, *ds = &ads;
|
||||
@ -1195,7 +1197,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;
|
||||
}
|
||||
@ -1252,7 +1254,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;
|
||||
struct game_drawstate *ds = snew(struct game_drawstate);
|
||||
@ -1335,9 +1337,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y, int v)
|
||||
draw_update(dr, tx, ty, 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 /*, wh = w*h */;
|
||||
int x, y;
|
||||
@ -1400,14 +1403,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)
|
||||
return FLASH_LENGTH;
|
||||
@ -1415,21 +1418,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)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user