From a4fca3286f3aa630a3641e50a8e1f44ab1504a29 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 21 Apr 2023 15:30:41 +0100 Subject: Pass a game_ui to compute_size, print_size and print. I'm about to move some of the bodgy getenv-based options so that they become fields in game_ui. So these functions, which could previously access those options directly via getenv, will now need to be given a game_ui where they can look them up. --- palisade.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'palisade.c') diff --git a/palisade.c b/palisade.c index 09ef3af..0af19e5 100644 --- a/palisade.c +++ b/palisade.c @@ -1043,7 +1043,7 @@ static game_state *execute_move(const game_state *state, const char *move) /* --- Drawing routines --------------------------------------------- */ static void game_compute_size(const game_params *params, int tilesize, - int *x, int *y) + const game_ui *ui, int *x, int *y) { *x = (params->w + 1) * tilesize; *y = (params->h + 1) * tilesize; @@ -1291,11 +1291,12 @@ static int game_status(const game_state *state) return state->completed ? +1 : 0; } -static void game_print_size(const game_params *params, float *x, float *y) +static void game_print_size(const game_params *params, const game_ui *ui, + float *x, float *y) { int pw, ph; - game_compute_size(params, 700, &pw, &ph); /* 7mm, like loopy */ + game_compute_size(params, 700, ui, &pw, &ph); /* 7mm, like loopy */ *x = pw / 100.0F; *y = ph / 100.0F; @@ -1314,7 +1315,8 @@ static void print_line(drawing *dr, int x1, int y1, int x2, int y2, } else draw_line(dr, x1, y1, x2, y2, colour); } -static void game_print(drawing *dr, const game_state *state, int tilesize) +static void game_print(drawing *dr, const game_state *state, const game_ui *ui, + int tilesize) { int w = state->shared->params.w, h = state->shared->params.h; int ink = print_mono_colour(dr, 0); -- cgit v1.1