From 118abb4fc9365807ad4174588eeb9aefda550415 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 30 Jun 2005 09:07:00 +0000 Subject: General robustness patch from James Harvey: - most game_size() functions now work in doubles internally and round to nearest, meaning that they have less tendency to try to alter a size they returned happily from a previous call - couple of fiddly fixes (memory leaks, precautionary casts in printf argument lists) - midend_deserialise() now constructs an appropriate drawstate, which I can't think how I overlooked myself since I _thought_ I went through the entire midend structure field by field! [originally from svn r6041] --- twiddle.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'twiddle.c') diff --git a/twiddle.c b/twiddle.c index 7e2b816..fc12411 100644 --- a/twiddle.c +++ b/twiddle.c @@ -747,19 +747,19 @@ static game_state *execute_move(game_state *from, char *move) static void game_size(game_params *params, game_drawstate *ds, int *x, int *y, int expand) { - int tsx, tsy, ts; + double tsx, tsy, ts; /* * Each window dimension equals the tile size times one more * than the grid dimension (the border is half the width of the * tiles). */ - tsx = *x / (params->w + 1); - tsy = *y / (params->h + 1); + tsx = (double)*x / ((double)params->w + 1.0); + tsy = (double)*y / ((double)params->h + 1.0); ts = min(tsx, tsy); if (expand) - ds->tilesize = ts; + ds->tilesize = (int)(ts + 0.5); else - ds->tilesize = min(ts, PREFERRED_TILE_SIZE); + ds->tilesize = min((int)ts, PREFERRED_TILE_SIZE); *x = TILE_SIZE * params->w + 2 * BORDER; *y = TILE_SIZE * params->h + 2 * BORDER; -- cgit v1.1