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.
This commit is contained in:
Simon Tatham
2023-04-21 15:30:41 +01:00
parent ec2e2f3770
commit a4fca3286f
49 changed files with 214 additions and 144 deletions

View File

@ -3031,7 +3031,7 @@ static game_state *execute_move(const game_state *state, const char *move)
*/
static void game_compute_size(const game_params *params, int tilesize,
int *x, int *y)
const game_ui *ui, int *x, int *y)
{
int n = params->n, w = n+2, h = n+1;
@ -3371,19 +3371,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)
{
int w = state->w, h = state->h;
int c, x, y;