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. --- solo.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'solo.c') diff --git a/solo.c b/solo.c index 1dad766..4005f2d 100644 --- a/solo.c +++ b/solo.c @@ -4810,7 +4810,7 @@ static game_state *execute_move(const game_state *from, const char *move) #define GETTILESIZE(cr, w) ( (double)(w-1) / (double)(cr+1) ) static void game_compute_size(const game_params *params, int tilesize, - int *x, int *y) + const game_ui *ui, int *x, int *y) { /* Ick: fake up `ds->tilesize' for macro expansion purposes */ struct { int tilesize; } ads, *ds = &ads; @@ -5330,7 +5330,8 @@ 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; @@ -5339,7 +5340,7 @@ static void game_print_size(const game_params *params, float *x, float *y) * for this game, because players will want to jot down no end * of pencil marks in the squares. */ - game_compute_size(params, 900, &pw, &ph); + game_compute_size(params, 900, ui, &pw, &ph); *x = pw / 100.0F; *y = ph / 100.0F; } @@ -5513,7 +5514,8 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds, sfree(coords); } -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 cr = state->cr; int ink = print_mono_colour(dr, 0); -- cgit v1.1