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. --- filling.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'filling.c') diff --git a/filling.c b/filling.c index 61060b4..970301c 100644 --- a/filling.c +++ b/filling.c @@ -1652,7 +1652,7 @@ enum { }; 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; @@ -2092,19 +2092,21 @@ 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; /* * I'll use 6mm squares by default. */ - game_compute_size(params, 600, &pw, &ph); + game_compute_size(params, 600, ui, &pw, &ph); *x = pw / 100.0F; *y = ph / 100.0F; } -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) { const int w = state->shared->params.w; const int h = state->shared->params.h; -- cgit v1.1