zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 08:25:45 -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
mines.c
View File

@ -2607,19 +2607,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 3 more than
* the grid dimension (the border is 3/2 the width of the
* tiles).
*/
tsx = *x / (params->w + 3);
tsy = *y / (params->h + 3);
tsx = (double)*x / ((double)params->w + 3.0);
tsy = (double)*y / ((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 = BORDER * 2 + TILE_SIZE * params->w;
*y = BORDER * 2 + TILE_SIZE * params->h;