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);
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;
*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->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);
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);
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)
{
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) {
+ 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);
}
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));
/*
(state->completed ? "COMPLETED! " : ""),
(state->completed ? state->completed : state->movecount));
- status_bar(fe, statusbuf);
+ status_bar(dr, statusbuf);
}
}
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
#endif
const struct game thegame = {
- "Cube", "games.cube",
+ "Cube", "games.cube", "cube",
default_params,
game_fetch_preset,
decode_params,
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 */
};