~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Load and Save are now supported on all three desktop platforms, and
[sgt/puzzles]
/
twiddle.c
diff --git
a/twiddle.c
b/twiddle.c
index
02b1d79
..
fc12411
100644
(file)
--- a/
twiddle.c
+++ b/
twiddle.c
@@
-307,7
+307,7
@@
static int grid_complete(int *grid, int wh, int orientable)
}
static char *new_game_desc(game_params *params, random_state *rs,
}
static char *new_game_desc(game_params *params, random_state *rs,
-
game_aux_info
**aux, int interactive)
+
char
**aux, int interactive)
{
int *grid;
int w = params->w, h = params->h, n = params->n, wh = w*h;
{
int *grid;
int w = params->w, h = params->h, n = params->n, wh = w*h;
@@
-430,11
+430,6
@@
static char *new_game_desc(game_params *params, random_state *rs,
return ret;
}
return ret;
}
-static void game_free_aux_info(game_aux_info *aux)
-{
- assert(!"Shouldn't happen");
-}
-
static char *validate_desc(game_params *params, char *desc)
{
char *p, *err;
static char *validate_desc(game_params *params, char *desc)
{
char *p, *err;
@@
-547,7
+542,7
@@
static int compare_int(const void *av, const void *bv)
}
static char *solve_game(game_state *state, game_state *currstate,
}
static char *solve_game(game_state *state, game_state *currstate,
-
game_aux_info
*aux, char **error)
+
char
*aux, char **error)
{
return dupstr("S");
}
{
return dupstr("S");
}
@@
-608,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)
{
}
{
}
@@
-752,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;
@@
-1224,7
+1219,6
@@
const struct game thegame = {
TRUE, game_configure, custom_params,
validate_params,
new_game_desc,
TRUE, game_configure, custom_params,
validate_params,
new_game_desc,
- game_free_aux_info,
validate_desc,
new_game,
dup_game,
validate_desc,
new_game,
dup_game,