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

10
loopy.c
View File

@ -883,7 +883,7 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
}
static void game_compute_size(const game_params *params, int tilesize,
int *x, int *y)
const game_ui *ui, int *x, int *y)
{
int grid_width, grid_height, rendered_width, rendered_height;
int g_tilesize;
@ -3554,19 +3554,21 @@ static int game_status(const game_state *state)
return state->solved ? +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 7mm "squares" by default.
*/
game_compute_size(params, 700, &pw, &ph);
game_compute_size(params, 700, 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 ink = print_mono_colour(dr, 0);
int i;