~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent drags from being started outside the playing area, which was
[sgt/puzzles]
/
twiddle.c
diff --git
a/twiddle.c
b/twiddle.c
index
06dbaed
..
fc12411
100644
(file)
--- a/
twiddle.c
+++ b/
twiddle.c
@@
-603,12
+603,12
@@
static void free_ui(game_ui *ui)
{
}
{
}
-char *encode_ui(game_ui *ui)
+
static
char *encode_ui(game_ui *ui)
{
return NULL;
}
{
return NULL;
}
-void decode_ui(game_ui *ui, char *encoding)
+
static
void decode_ui(game_ui *ui, char *encoding)
{
}
{
}
@@
-747,19
+747,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)
{
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 one more
* than the grid dimension (the border is half the width of the
* tiles).
*/
/*
* Each window dimension equals the tile size times one more
* than the grid dimension (the border is half the width of the
* tiles).
*/
- tsx =
*x / (params->w + 1
);
- tsy =
*y / (params->h + 1
);
+ tsx =
(double)*x / ((double)params->w + 1.0
);
+ tsy =
(double)*y / ((double)params->h + 1.0
);
ts = min(tsx, tsy);
if (expand)
ts = min(tsx, tsy);
if (expand)
- ds->tilesize =
ts
;
+ ds->tilesize =
(int)(ts + 0.5)
;
else
else
- ds->tilesize = min(ts, PREFERRED_TILE_SIZE);
+ ds->tilesize = min(
(int)
ts, PREFERRED_TILE_SIZE);
*x = TILE_SIZE * params->w + 2 * BORDER;
*y = TILE_SIZE * params->h + 2 * BORDER;
*x = TILE_SIZE * params->w + 2 * BORDER;
*y = TILE_SIZE * params->h + 2 * BORDER;