~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make peg removal accessible from the keyboard.
[sgt/puzzles]
/
fifteen.c
diff --git
a/fifteen.c
b/fifteen.c
index
9d763a6
..
5da2548
100644
(file)
--- a/
fifteen.c
+++ b/
fifteen.c
@@
-152,7
+152,7
@@
static int perm_parity(int *perm, int n)
}
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 gap, n, i, x;
int x1, x2, p1, p2, parity;
{
int gap, n, i, x;
int x1, x2, p1, p2, parity;
@@
-267,11
+267,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;
@@
-380,7
+375,7
@@
static void free_game(game_state *state)
}
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");
}
@@
-436,6
+431,15
@@
static void free_ui(game_ui *ui)
{
}
{
}
+static char *encode_ui(game_ui *ui)
+{
+ return NULL;
+}
+
+static void decode_ui(game_ui *ui, char *encoding)
+{
+}
+
static void game_changed_state(game_ui *ui, game_state *oldstate,
game_state *newstate)
{
static void game_changed_state(game_ui *ui, game_state *oldstate,
game_state *newstate)
{
@@
-873,7
+877,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,
@@
-882,6
+885,8
@@
const struct game thegame = {
TRUE, game_text_format,
new_ui,
free_ui,
TRUE, game_text_format,
new_ui,
free_ui,
+ encode_ui,
+ decode_ui,
game_changed_state,
interpret_move,
execute_move,
game_changed_state,
interpret_move,
execute_move,