diff --git a/cube.c b/cube.c index 145a1e5..33144b6 100644 --- a/cube.c +++ b/cube.c @@ -1531,15 +1531,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Cube", "games.cube", TRUE, + "Cube", "games.cube", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/fifteen.c b/fifteen.c index 2263bc1..dc265be 100644 --- a/fifteen.c +++ b/fifteen.c @@ -724,15 +724,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Fifteen", "games.fifteen", TRUE, + "Fifteen", "games.fifteen", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/net.c b/net.c index 7b3a501..d41cebe 100644 --- a/net.c +++ b/net.c @@ -1494,15 +1494,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Net", "games.net", TRUE, + "Net", "games.net", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/netslide.c b/netslide.c index aee6e24..9f334f6 100644 --- a/netslide.c +++ b/netslide.c @@ -1518,15 +1518,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Netslide", "games.netslide", TRUE, + "Netslide", "games.netslide", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/nullgame.c b/nullgame.c index 3d5270d..a071971 100644 --- a/nullgame.c +++ b/nullgame.c @@ -208,15 +208,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Null Game", NULL, FALSE, + "Null Game", NULL, default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + FALSE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/pattern.c b/pattern.c index cbedbf6..61f15ff 100644 --- a/pattern.c +++ b/pattern.c @@ -1015,15 +1015,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Pattern", "games.pattern", TRUE, + "Pattern", "games.pattern", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/puzzles.h b/puzzles.h index e873351..e62a27c 100644 --- a/puzzles.h +++ b/puzzles.h @@ -178,13 +178,13 @@ void random_free(random_state *state); struct game { const char *name; const char *winhelp_topic; - int can_configure; game_params *(*default_params)(void); int (*fetch_preset)(int i, char **name, game_params **params); game_params *(*decode_params)(char const *string); char *(*encode_params)(game_params *); void (*free_params)(game_params *params); game_params *(*dup_params)(game_params *params); + int can_configure; config_item *(*configure)(game_params *params); game_params *(*custom_params)(config_item *cfg); char *(*validate_params)(game_params *params); diff --git a/rect.c b/rect.c index e3914b0..5ab296a 100644 --- a/rect.c +++ b/rect.c @@ -1600,15 +1600,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Rectangles", "games.rectangles", TRUE, + "Rectangles", "games.rectangles", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/sixteen.c b/sixteen.c index 828168e..c90062b 100644 --- a/sixteen.c +++ b/sixteen.c @@ -774,15 +774,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Sixteen", "games.sixteen", TRUE, + "Sixteen", "games.sixteen", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/solo.c b/solo.c index f6d28ec..c60cd66 100644 --- a/solo.c +++ b/solo.c @@ -1887,15 +1887,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Solo", "games.solo", TRUE, + "Solo", "games.solo", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed, diff --git a/twiddle.c b/twiddle.c index 1992c01..0bfdabe 100644 --- a/twiddle.c +++ b/twiddle.c @@ -928,15 +928,14 @@ static int game_wants_statusbar(void) #endif const struct game thegame = { - "Twiddle", "games.twiddle", TRUE, + "Twiddle", "games.twiddle", default_params, game_fetch_preset, decode_params, encode_params, free_params, dup_params, - game_configure, - custom_params, + TRUE, game_configure, custom_params, validate_params, new_game_seed, validate_seed,