zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 16:32:13 -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
solo.c
View File

@ -2024,7 +2024,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
return NULL;
sprintf(buf, "%c%d,%d,%d",
ui->hpencil && n > 0 ? 'P' : 'R', ui->hx, ui->hy, n);
(char)(ui->hpencil && n > 0 ? 'P' : 'R'), ui->hx, ui->hy, n);
ui->hx = ui->hy = -1;
@ -2090,19 +2090,19 @@ static game_state *execute_move(game_state *from, char *move)
*/
#define SIZE(cr) ((cr) * TILE_SIZE + 2*BORDER + 1)
#define GETTILESIZE(cr, w) ( (w-1) / (cr+1) )
#define GETTILESIZE(cr, w) ( (double)(w-1) / (double)(cr+1) )
static void game_size(game_params *params, game_drawstate *ds,
int *x, int *y, int expand)
{
int c = params->c, r = params->r, cr = c*r;
int ts;
double ts;
ts = min(GETTILESIZE(cr, *x), GETTILESIZE(cr, *y));
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 = SIZE(cr);
*y = SIZE(cr);