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. --- guess.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'guess.c') diff --git a/guess.c b/guess.c index dc02d57..27aeabd 100644 --- a/guess.c +++ b/guess.c @@ -999,7 +999,7 @@ static game_state *execute_move(const game_state *from, const char *move) #define BORDER 0.5 static void game_compute_size(const game_params *params, int tilesize, - int *x, int *y) + const game_ui *ui, int *x, int *y) { double hmul, vmul_c, vmul_g, vmul; int hintw = (params->npegs+1)/2; @@ -1043,7 +1043,8 @@ static void game_set_size(drawing *dr, game_drawstate *ds, guessh = ((ds->pegsz + ds->gapsz) * params->nguesses); /* guesses */ guessh += ds->gapsz + ds->pegsz; /* solution */ - game_compute_size(params, tilesize, &ds->w, &ds->h); + /* We know we don't need anything from the game_ui we haven't got */ + game_compute_size(params, tilesize, NULL, &ds->w, &ds->h); ds->colx = ds->border; ds->coly = (ds->h - colh) / 2; -- cgit v1.1