chiark
/
gitweb
/
~ian
/
sgt-puzzles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More serialisation changes: the game_aux_info structure has now been
[sgt-puzzles.git]
/
flip.c
diff --git
a/flip.c
b/flip.c
index 1d7fa172e5623b91e6a0123ed837779a3a6ab46c..ce8202c7ae023a84ba4d92418bd561391ac8356d 100644
(file)
--- a/
flip.c
+++ b/
flip.c
@@
-347,7
+347,7
@@
static void addneighbours(tree234 *t, int w, int h, int cx, int cy,
}
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 w = params->w, h = params->h, wh = w * h;
int i, j;
{
int w = params->w, h = params->h, wh = w * h;
int i, j;
@@
-595,11
+595,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)
{
int w = params->w, h = params->h, wh = w * h;
static char *validate_desc(game_params *params, char *desc)
{
int w = params->w, h = params->h, wh = w * h;
@@
-676,7
+671,7
@@
static void rowxor(unsigned char *row1, unsigned char *row2, int len)
}
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)
{
int w = state->w, h = state->h, wh = w * h;
unsigned char *equations, *solution, *shortest;
{
int w = state->w, h = state->h, wh = w * h;
unsigned char *equations, *solution, *shortest;
@@
-1229,7
+1224,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,