mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-20 23:51:29 -07:00
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:
10
loopy.c
10
loopy.c
@ -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;
|
||||
|
Reference in New Issue
Block a user