zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pass a game_ui to compute_size, print_size and print.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
galaxies.c
View File

@ -3405,7 +3405,7 @@ badmove:
*/
static void game_compute_size(const game_params *params, int sz,
int *x, int *y)
const game_ui *ui, int *x, int *y)
{
struct { int tilesize, w, h; } ads, *ds = &ads;
@ -3926,7 +3926,8 @@ static int game_status(const game_state *state)
}
#ifndef EDITOR
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;
@ -3934,12 +3935,13 @@ static void game_print_size(const game_params *params, float *x, float *y)
* 8mm squares by default. (There isn't all that much detail
* that needs to go in each square.)
*/
game_compute_size(params, 800, &pw, &ph);
game_compute_size(params, 800, ui, &pw, &ph);
*x = pw / 100.0F;
*y = ph / 100.0F;
}
static void game_print(drawing *dr, const game_state *state, int sz)
static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
int sz)
{
int w = state->w, h = state->h;
int white, black, blackish;