aboutsummaryrefslogtreecommitdiff
path: root/galaxies.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2023-04-21 15:30:41 +0100
committerSimon Tatham <anakin@pobox.com>2023-04-21 16:18:04 +0100
commita4fca3286f3aa630a3641e50a8e1f44ab1504a29 (patch)
tree43ff6e5c34d83b607b4ac3bc42b886a300cbaa5d /galaxies.c
parentec2e2f37703e1da4bb097c27ae5e7f1fa368624b (diff)
downloadpuzzles-a4fca3286f3aa630a3641e50a8e1f44ab1504a29.zip
puzzles-a4fca3286f3aa630a3641e50a8e1f44ab1504a29.tar.gz
puzzles-a4fca3286f3aa630a3641e50a8e1f44ab1504a29.tar.bz2
puzzles-a4fca3286f3aa630a3641e50a8e1f44ab1504a29.tar.xz
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.
Diffstat (limited to 'galaxies.c')
-rw-r--r--galaxies.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/galaxies.c b/galaxies.c
index 37a530d..dfa1274 100644
--- a/galaxies.c
+++ b/galaxies.c
@@ -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;