Cosmetic: fix mismatch between game_compute_size() and game_redraw()

[sgt/puzzles] / map.c

diff --git a/map.c b/map.c
index b6b6194..bbd9a8e 100644 (file)
--- a/map.c
+++ b/map.c
@@ -2247,6 +2247,11 @@ static char *solve_game(game_state *state, game_state *currstate,
     return dupstr(aux);
 }
 
+static int game_can_format_as_text_now(game_params *params)
+{
+    return TRUE;
+}
+
 static char *game_text_format(game_state *state)
 {
     return NULL;
@@ -2532,7 +2537,7 @@ static void game_set_size(drawing *dr, game_drawstate *ds,
 
 const float map_colours[FOUR][3] = {
 #ifdef VIVID_COLOURS
-    // Use more vivid colours (e.g. on the Pocket PC)
+    /* Use more vivid colours (e.g. on the Pocket PC) */
     {0.75F, 0.25F, 0.25F},
     {0.3F,  0.7F,  0.3F},
     {0.3F,  0.3F,  0.7F},
@@ -2977,8 +2982,9 @@ static void game_print(drawing *dr, game_state *state, int tilesize)
 
     ink = print_mono_colour(dr, 0);
     for (i = 0; i < FOUR; i++)
-       c[i] = print_rgb_colour(dr, map_hatching[i], map_colours[i][0],
-                               map_colours[i][1], map_colours[i][2]);
+       c[i] = print_rgb_hatched_colour(dr, map_colours[i][0],
+                                       map_colours[i][1], map_colours[i][2],
+                                       map_hatching[i]);
 
     coordsize = 0;
     coords = NULL;
@@ -3121,7 +3127,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,