zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

General robustness patch from James Harvey:

Browse Source 
- 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]
This commit is contained in:
Simon Tatham
2005-06-30 09:07:00 +00:00
parent 101324af67
commit 118abb4fc9
9 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samegame.c
View File

@ -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;