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] --- rect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rect.c') diff --git a/rect.c b/rect.c index 5852f59..f092a2d 100644 --- a/rect.c +++ b/rect.c @@ -2498,7 +2498,7 @@ 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 1.5 more * than the grid dimension (the border is 3/4 the width of the @@ -2507,13 +2507,13 @@ static void game_size(game_params *params, game_drawstate *ds, * We must cast to unsigned before multiplying by two, because * *x might be INT_MAX. */ - tsx = 2 * (unsigned)*x / (2 * params->w + 3); - tsy = 2 * (unsigned)*y / (2 * params->h + 3); + tsx = 2.0 * (double)*x / (2.0 * (double)params->w + 3.0); + tsy = 2.0 * (double)*y / (2.0 * (double)params->h + 3.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 = params->w * TILE_SIZE + 2*BORDER + 1; *y = params->h * TILE_SIZE + 2*BORDER + 1; -- cgit v1.1