aboutsummaryrefslogtreecommitdiff
path: root/range.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 /range.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 'range.c')
-rw-r--r--range.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/range.c b/range.c
index 54272e6..1fbb87c 100644
--- a/range.c
+++ b/range.c
@@ -1623,7 +1623,7 @@ enum {
};
static void game_compute_size(const game_params *params, int tilesize,
- int *x, int *y)
+ const game_ui *ui, int *x, int *y)
{
*x = (1 + params->w) * tilesize;
*y = (1 + params->h) * tilesize;
@@ -1766,15 +1766,17 @@ static void draw_cell(drawing *draw, game_drawstate *ds, int r, int c,
* User interface: print
*/
-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 print_width, print_height;
- game_compute_size(params, 800, &print_width, &print_height);
+ game_compute_size(params, 800, ui, &print_width, &print_height);
*x = print_width / 100.0F;
*y = print_height / 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 const w = state->params.w, h = state->params.h;
game_drawstate ds_obj, *ds = &ds_obj;