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

5
guess.c
View File

@ -999,7 +999,7 @@ static game_state *execute_move(const game_state *from, const char *move)
#define BORDER 0.5
static void game_compute_size(const game_params *params, int tilesize,
int *x, int *y)
const game_ui *ui, int *x, int *y)
{
double hmul, vmul_c, vmul_g, vmul;
int hintw = (params->npegs+1)/2;
@ -1043,7 +1043,8 @@ static void game_set_size(drawing *dr, game_drawstate *ds,
guessh = ((ds->pegsz + ds->gapsz) * params->nguesses); /* guesses */
guessh += ds->gapsz + ds->pegsz; /* solution */
game_compute_size(params, tilesize, &ds->w, &ds->h);
/* We know we don't need anything from the game_ui we haven't got */
game_compute_size(params, tilesize, NULL, &ds->w, &ds->h);
ds->colx = ds->border;
ds->coly = (ds->h - colh) / 2;