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
solo.c
View File

@ -4810,7 +4810,7 @@ static game_state *execute_move(const game_state *from, const char *move)
#define GETTILESIZE(cr, w) ( (double)(w-1) / (double)(cr+1) )
static void game_compute_size(const game_params *params, int tilesize,
int *x, int *y)
const game_ui *ui, int *x, int *y)
{
/* Ick: fake up `ds->tilesize' for macro expansion purposes */
struct { int tilesize; } ads, *ds = &ads;
@ -5330,7 +5330,8 @@ 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;
@ -5339,7 +5340,7 @@ static void game_print_size(const game_params *params, float *x, float *y)
* for this game, because players will want to jot down no end
* of pencil marks in the squares.
*/
game_compute_size(params, 900, &pw, &ph);
game_compute_size(params, 900, ui, &pw, &ph);
*x = pw / 100.0F;
*y = ph / 100.0F;
}
@ -5513,7 +5514,8 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds,
sfree(coords);
}
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 cr = state->cr;
int ink = print_mono_colour(dr, 0);