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] --- samegame.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'samegame.c') diff --git a/samegame.c b/samegame.c index 18110f5..ed516e2 100644 --- a/samegame.c +++ b/samegame.c @@ -689,7 +689,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; /* * We could choose the tile gap dynamically as well if we @@ -708,14 +708,14 @@ static void game_size(game_params *params, game_drawstate *ds, int *x, int *y, * We must cast to unsigned before adding to *x and *y, since * they might be INT_MAX! */ - tsx = (unsigned)(*x + ds->tilegap) / (params->w + 1); - tsy = (unsigned)(*y + ds->tilegap) / (params->h + 1); + tsx = ((double)*x + (double)ds->tilegap) / ((double)params->w + 1.0); + tsy = ((double)*y + (double)ds->tilegap) / ((double)params->h + 1.0); ts = min(tsx, tsy); if (expand) - ds->tileinner = ts - ds->tilegap; + ds->tileinner = (int)(ts+0.5) - ds->tilegap; else - ds->tileinner = min(ts, PREFERRED_TILE_SIZE) - ds->tilegap; + ds->tileinner = min((int)ts, PREFERRED_TILE_SIZE) - ds->tilegap; *x = TILE_SIZE * params->w + 2 * BORDER - TILE_GAP; *y = TILE_SIZE * params->h + 2 * BORDER - TILE_GAP; -- cgit v1.1