X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/dafd6cf6826f9bbd27ddd780fab48221d4706556..0b119fd7d6d58c9cb8210477fa8c4573744c69d8:/dominosa.c

diff --git a/dominosa.c b/dominosa.c
index 6d4e462..bd170dc 100644
--- a/dominosa.c
+++ b/dominosa.c
@@ -109,8 +109,12 @@ static int game_fetch_preset(int i, char **name, game_params **params)
 
     switch (i) {
       case 0: n = 3; break;
-      case 1: n = 6; break;
-      case 2: n = 9; break;
+      case 1: n = 4; break;
+      case 2: n = 5; break;
+      case 3: n = 6; break;
+      case 4: n = 7; break;
+      case 5: n = 8; break;
+      case 6: n = 9; break;
       default: return FALSE;
     }
 
@@ -1171,6 +1175,11 @@ static char *solve_game(game_state *state, game_state *currstate,
     return ret;
 }
 
+static int game_can_format_as_text_now(game_params *params)
+{
+    return TRUE;
+}
+
 static char *game_text_format(game_state *state)
 {
     return NULL;
@@ -1439,7 +1448,7 @@ static void game_set_size(drawing *dr, game_drawstate *ds,
     ds->tilesize = tilesize;
 }
 
-static float *game_colours(frontend *fe, game_state *state, int *ncolours)
+static float *game_colours(frontend *fe, int *ncolours)
 {
     float *ret = snewn(3 * NCOLOURS, float);
 
@@ -1682,11 +1691,6 @@ static float game_flash_length(game_state *oldstate, game_state *newstate,
     return 0.0F;
 }
 
-static int game_wants_statusbar(void)
-{
-    return FALSE;
-}
-
 static int game_timing_state(game_state *state, game_ui *ui)
 {
     return TRUE;
@@ -1711,7 +1715,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
-    ads.tilesize = tilesize;
+    game_set_size(dr, ds, NULL, tilesize);
 
     c = print_mono_colour(dr, 1); assert(c == COL_BACKGROUND);
     c = print_mono_colour(dr, 0); assert(c == COL_TEXT);
@@ -1745,7 +1749,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 #endif
 
 const struct game thegame = {
-    "Dominosa", "games.dominosa",
+    "Dominosa", "games.dominosa", "dominosa",
     default_params,
     game_fetch_preset,
     decode_params,
@@ -1760,7 +1764,7 @@ const struct game thegame = {
     dup_game,
     free_game,
     TRUE, solve_game,
-    FALSE, game_text_format,
+    FALSE, game_can_format_as_text_now, game_text_format,
     new_ui,
     free_ui,
     encode_ui,
@@ -1776,7 +1780,7 @@ const struct game thegame = {
     game_anim_length,
     game_flash_length,
     TRUE, FALSE, game_print_size, game_print,
-    game_wants_statusbar,
+    FALSE,			       /* wants_statusbar */
     FALSE, game_timing_state,
-    0,				       /* mouse_priorities */
+    0,				       /* flags */
 };