X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/3ff276f2cd88e6f3a6fe08f95f6147abbe3fcfd4..6bb2af847d3bad4f2a544ad7a428f7063fd1991a:/cube.c

diff --git a/cube.c b/cube.c
index 2003163..60730c0 100644
--- a/cube.c
+++ b/cube.c
@@ -285,7 +285,7 @@ static void decode_params(game_params *ret, char const *string)
       default: break;
     }
     ret->d1 = ret->d2 = atoi(string);
-    while (*string && isdigit(*string)) string++;
+    while (*string && isdigit((unsigned char)*string)) string++;
     if (*string == 'x') {
         string++;
         ret->d2 = atoi(string);
@@ -863,7 +863,7 @@ static char *validate_desc(game_params *params, char *desc)
     return NULL;
 }
 
-static game_state *new_game(midend_data *me, game_params *params, char *desc)
+static game_state *new_game(midend *me, game_params *params, char *desc)
 {
     game_state *state = snew(game_state);
     int area;
@@ -985,6 +985,11 @@ static char *solve_game(game_state *state, game_state *currstate,
     return NULL;
 }
 
+static int game_can_format_as_text_now(game_params *params)
+{
+    return TRUE;
+}
+
 static char *game_text_format(game_state *state)
 {
     return NULL;
@@ -1110,8 +1115,8 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
         int cx, cy;
         double angle;
 
-        cx = state->squares[state->current].x * GRID_SCALE + ds->ox;
-        cy = state->squares[state->current].y * GRID_SCALE + ds->oy;
+        cx = (int)(state->squares[state->current].x * GRID_SCALE) + ds->ox;
+        cy = (int)(state->squares[state->current].y * GRID_SCALE) + ds->oy;
 
         if (x == cx && y == cy)
             return NULL;               /* clicked in exact centre!  */
@@ -1466,17 +1471,17 @@ static void game_compute_size(game_params *params, int tilesize,
     *y = YSIZE(tilesize, bb, solids[params->solid]);
 }
 
-static void game_set_size(game_drawstate *ds, game_params *params,
-			  int tilesize)
+static void game_set_size(drawing *dr, game_drawstate *ds,
+			  game_params *params, int tilesize)
 {
     struct bbox bb = find_bbox(params);
 
-    ds->gridscale = tilesize;
+    ds->gridscale = (float)tilesize;
     ds->ox = (int)(-(bb.l - solids[params->solid]->border) * ds->gridscale);
     ds->oy = (int)(-(bb.u - solids[params->solid]->border) * ds->gridscale);
 }
 
-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);
 
@@ -1494,21 +1499,22 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours)
     return ret;
 }
 
-static game_drawstate *game_new_drawstate(game_state *state)
+static game_drawstate *game_new_drawstate(drawing *dr, game_state *state)
 {
     struct game_drawstate *ds = snew(struct game_drawstate);
 
-    ds->ox = ds->oy = ds->gridscale = 0.0F;/* not decided yet */
+    ds->ox = ds->oy = 0;
+    ds->gridscale = 0.0F; /* not decided yet */
 
     return ds;
 }
 
-static void game_free_drawstate(game_drawstate *ds)
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 {
     sfree(ds);
 }
 
-static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
+static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
                         game_state *state, int dir, game_ui *ui,
                         float animtime, float flashtime)
 {
@@ -1521,7 +1527,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
     game_state *newstate;
     int square;
 
-    draw_rect(fe, 0, 0, XSIZE(GRID_SCALE, bb, state->solid),
+    draw_rect(dr, 0, 0, XSIZE(GRID_SCALE, bb, state->solid),
 	      YSIZE(GRID_SCALE, bb, state->solid), COL_BACKGROUND);
 
     if (dir < 0) {
@@ -1565,7 +1571,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 			     + ds->oy);
         }
 
-        draw_polygon(fe, coords, state->squares[i].npoints,
+        draw_polygon(dr, coords, state->squares[i].npoints,
                      state->squares[i].blue ? COL_BLUE : COL_BACKGROUND,
 		     COL_BORDER);
     }
@@ -1647,13 +1653,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
                 continue;
         }
 
-        draw_polygon(fe, coords, poly->order,
+        draw_polygon(dr, coords, poly->order,
                      state->facecolours[i] ? COL_BLUE : COL_BACKGROUND,
 		     COL_BORDER);
     }
     sfree(poly);
 
-    draw_update(fe, 0, 0, XSIZE(GRID_SCALE, bb, state->solid),
+    draw_update(dr, 0, 0, XSIZE(GRID_SCALE, bb, state->solid),
 		YSIZE(GRID_SCALE, bb, state->solid));
 
     /*
@@ -1666,7 +1672,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 		(state->completed ? "COMPLETED! " : ""),
 		(state->completed ? state->completed : state->movecount));
 
-	status_bar(fe, statusbuf);
+	status_bar(dr, statusbuf);
     }
 }
 
@@ -1682,14 +1688,17 @@ static float game_flash_length(game_state *oldstate,
     return 0.0F;
 }
 
-static int game_wants_statusbar(void)
+static int game_timing_state(game_state *state, game_ui *ui)
 {
     return TRUE;
 }
 
-static int game_timing_state(game_state *state)
+static void game_print_size(game_params *params, float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, game_state *state, int tilesize)
 {
-    return TRUE;
 }
 
 #ifdef COMBINED
@@ -1697,7 +1706,7 @@ static int game_timing_state(game_state *state)
 #endif
 
 const struct game thegame = {
-    "Cube", "games.cube",
+    "Cube", "games.cube", "cube",
     default_params,
     game_fetch_preset,
     decode_params,
@@ -1712,7 +1721,7 @@ const struct game thegame = {
     dup_game,
     free_game,
     FALSE, solve_game,
-    FALSE, game_text_format,
+    FALSE, game_can_format_as_text_now, game_text_format,
     new_ui,
     free_ui,
     encode_ui,
@@ -1727,7 +1736,8 @@ const struct game thegame = {
     game_redraw,
     game_anim_length,
     game_flash_length,
-    game_wants_statusbar,
+    FALSE, FALSE, game_print_size, game_print,
+    TRUE,			       /* wants_statusbar */
     FALSE, game_timing_state,
-    0,				       /* mouse_priorities */
+    0,				       /* flags */
 };