aboutsummaryrefslogtreecommitdiff
path: root/map.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2013-04-13 10:37:32 +0000
committerSimon Tatham <anakin@pobox.com>2013-04-13 10:37:32 +0000
commit251b21c41813055d9c416378508b1ee038bc3dac (patch)
tree3adb963c93a9ae014c8c7d6fd1bce5498d6bd062 /map.c
parent339329449f4db72e4754f21c14295303ffe0ea5d (diff)
downloadpuzzles-251b21c41813055d9c416378508b1ee038bc3dac.zip
puzzles-251b21c41813055d9c416378508b1ee038bc3dac.tar.gz
puzzles-251b21c41813055d9c416378508b1ee038bc3dac.tar.bz2
puzzles-251b21c41813055d9c416378508b1ee038bc3dac.tar.xz
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]
Diffstat (limited to 'map.c')
-rw-r--r--map.c86
1 files changed, 45 insertions, 41 deletions
diff --git a/map.c b/map.c
index 34a9536..f3c4430 100644
--- a/map.c
+++ b/map.c
@@ -155,7 +155,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 */
@@ -192,7 +192,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[400];
@@ -203,7 +203,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];
@@ -241,7 +241,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);
@@ -253,7 +253,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 < 2 || params->h < 2)
return "Width and height must be at least two";
@@ -1704,11 +1704,12 @@ static char *new_game_desc(const game_params *params, random_state *rs,
return ret;
}
-static char *parse_edge_list(const game_params *params, char **desc, int *map)
+static char *parse_edge_list(const game_params *params, const char **desc,
+ int *map)
{
int w = params->w, h = params->h, wh = w*h, n = params->n;
int i, k, pos, state;
- char *p = *desc;
+ const char *p = *desc;
dsf_init(map+wh, wh);
@@ -1780,7 +1781,7 @@ static char *parse_edge_list(const game_params *params, char **desc, int *map)
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, h = params->h, wh = w*h, n = params->n;
int area;
@@ -1815,11 +1816,12 @@ 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, wh = w*h, n = params->n;
int i, pos;
- char *p;
+ const char *p;
game_state *state = snew(game_state);
state->p = *params;
@@ -2154,7 +2156,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);
@@ -2188,8 +2190,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)
{
if (!aux) {
/*
@@ -2248,12 +2250,12 @@ static char *solve_game(game_state *state, game_state *currstate,
return dupstr(aux);
}
-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;
}
@@ -2275,7 +2277,7 @@ struct game_ui {
int cur_x, cur_y, cur_visible, cur_moved, cur_lastmove;
};
-static game_ui *new_ui(game_state *state)
+static game_ui *new_ui(const game_state *state)
{
game_ui *ui = snew(game_ui);
ui->dragx = ui->dragy = -1;
@@ -2292,17 +2294,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)
{
}
@@ -2342,8 +2344,8 @@ struct game_drawstate {
((button) == CURSOR_UP) ? -1 : 0)
-static int region_from_coords(game_state *state, const game_drawstate *ds,
- int x, int y)
+static int region_from_coords(const game_state *state,
+ const game_drawstate *ds, int x, int y)
{
int w = state->p.w, h = state->p.h, wh = w*h /*, n = state->p.n */;
int tx = FROMCOORD(x), ty = FROMCOORD(y);
@@ -2361,8 +2363,9 @@ static int region_from_coords(game_state *state, const game_drawstate *ds,
return state->map->map[quadrant * wh + ty*w+tx];
}
-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)
{
char *bufp, buf[256];
int alt_button;
@@ -2497,7 +2500,7 @@ drag_dropped:
}
}
-static game_state *execute_move(game_state *state, char *move)
+static game_state *execute_move(const game_state *state, const char *move)
{
int n = state->p.n;
game_state *ret = dup_game(state);
@@ -2578,8 +2581,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;
@@ -2590,7 +2593,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;
@@ -2643,7 +2646,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);
int i;
@@ -2702,7 +2705,7 @@ static void draw_error(drawing *dr, game_drawstate *ds, int x, int y)
}
static void draw_square(drawing *dr, game_drawstate *ds,
- game_params *params, struct map *map,
+ const game_params *params, struct map *map,
int x, int y, unsigned long v)
{
int w = params->w, h = params->h, wh = w*h;
@@ -2831,9 +2834,10 @@ static void draw_square(drawing *dr, game_drawstate *ds,
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, wh = w*h, n = state->p.n;
int x, y, i;
@@ -3001,14 +3005,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) {
@@ -3025,17 +3029,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;
@@ -3049,7 +3053,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, wh = w*h, n = state->p.n;
int ink, c[FOUR], i;