Black Box: fix "reveal" button location, explain what's meant by the

[sgt/puzzles] / nullgame.c

diff --git a/nullgame.c b/nullgame.c
index 26307e1..212d5c2 100644 (file)
--- a/nullgame.c
+++ b/nullgame.c
@@ -78,7 +78,7 @@ static game_params *custom_params(config_item *cfg)
     return NULL;
 }
 
-static char *validate_params(game_params *params)
+static char *validate_params(game_params *params, int full)
 {
     return NULL;
 }
@@ -137,12 +137,12 @@ static void free_ui(game_ui *ui)
 {
 }
 
-char *encode_ui(game_ui *ui)
+static char *encode_ui(game_ui *ui)
 {
     return NULL;
 }
 
-void decode_ui(game_ui *ui, char *encoding)
+static void decode_ui(game_ui *ui, char *encoding)
 {
 }
 
@@ -152,6 +152,7 @@ static void game_changed_state(game_ui *ui, game_state *oldstate,
 }
 
 struct game_drawstate {
+    int tilesize;
     int FIXME;
 };
 
@@ -170,10 +171,16 @@ static game_state *execute_move(game_state *state, char *move)
  * Drawing routines.
  */
 
-static void game_size(game_params *params, game_drawstate *ds,
-                      int *x, int *y, int expand)
+static void game_compute_size(game_params *params, int tilesize,
+                             int *x, int *y)
 {
-    *x = *y = 200;                     /* FIXME */
+    *x = *y = 10 * tilesize;          /* FIXME */
+}
+
+static void game_set_size(game_drawstate *ds, game_params *params,
+                         int tilesize)
+{
+    ds->tilesize = tilesize;
 }
 
 static float *game_colours(frontend *fe, game_state *state, int *ncolours)
@@ -190,6 +197,7 @@ static game_drawstate *game_new_drawstate(game_state *state)
 {
     struct game_drawstate *ds = snew(struct game_drawstate);
 
+    ds->tilesize = 0;
     ds->FIXME = 0;
 
     return ds;
@@ -210,7 +218,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
      * should start by drawing a big background-colour rectangle
      * covering the whole window.
      */
-    draw_rect(fe, 0, 0, 200, 200, COL_BACKGROUND);
+    draw_rect(fe, 0, 0, 10*ds->tilesize, 10*ds->tilesize, COL_BACKGROUND);
 }
 
 static float game_anim_length(game_state *oldstate, game_state *newstate,
@@ -230,7 +238,7 @@ static int game_wants_statusbar(void)
     return FALSE;
 }
 
-static int game_timing_state(game_state *state)
+static int game_timing_state(game_state *state, game_ui *ui)
 {
     return TRUE;
 }
@@ -263,7 +271,7 @@ const struct game thegame = {
     game_changed_state,
     interpret_move,
     execute_move,
-    game_size,
+    20 /* FIXME */, game_compute_size, game_set_size,
     game_colours,
     game_new_drawstate,
     game_free_drawstate,