~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problems with arrow UI with non-square grid.
[sgt/puzzles]
/
cube.c
diff --git
a/cube.c
b/cube.c
index
e271ce3
..
bc91973
100644
(file)
--- a/
cube.c
+++ b/
cube.c
@@
-863,7
+863,7
@@
static char *validate_desc(game_params *params, char *desc)
return NULL;
}
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;
{
game_state *state = snew(game_state);
int area;
@@
-1466,8
+1466,8
@@
static void game_compute_size(game_params *params, int tilesize,
*y = YSIZE(tilesize, bb, solids[params->solid]);
}
*y = YSIZE(tilesize, bb, solids[params->solid]);
}
-static void game_set_size(
game_drawstate *ds, game_params *param
s,
- int tilesize)
+static void game_set_size(
drawing *dr, game_drawstate *d
s,
+
game_params *params,
int tilesize)
{
struct bbox bb = find_bbox(params);
{
struct bbox bb = find_bbox(params);
@@
-1476,7
+1476,7
@@
static void game_set_size(game_drawstate *ds, game_params *params,
ds->oy = (int)(-(bb.u - 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);
{
float *ret = snewn(3 * NCOLOURS, float);
@@
-1494,7
+1494,7
@@
static float *game_colours(frontend *fe, game_state *state, int *ncolours)
return ret;
}
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);
{
struct game_drawstate *ds = snew(struct game_drawstate);
@@
-1503,12
+1503,12
@@
static game_drawstate *game_new_drawstate(game_state *state)
return ds;
}
return ds;
}
-static void game_free_drawstate(game_drawstate *ds)
+static void game_free_drawstate(
drawing *dr,
game_drawstate *ds)
{
sfree(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 *state, int dir, game_ui *ui,
float animtime, float flashtime)
{
@@
-1521,7
+1521,7
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
game_state *newstate;
int square;
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) {
YSIZE(GRID_SCALE, bb, state->solid), COL_BACKGROUND);
if (dir < 0) {
@@
-1565,7
+1565,7
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
+ ds->oy);
}
+ 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);
}
state->squares[i].blue ? COL_BLUE : COL_BACKGROUND,
COL_BORDER);
}
@@
-1647,13
+1647,13
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
continue;
}
continue;
}
- draw_polygon(
fe
, coords, poly->order,
+ draw_polygon(
dr
, coords, poly->order,
state->facecolours[i] ? COL_BLUE : COL_BACKGROUND,
COL_BORDER);
}
sfree(poly);
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));
/*
YSIZE(GRID_SCALE, bb, state->solid));
/*
@@
-1666,7
+1666,7
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
(state->completed ? "COMPLETED! " : ""),
(state->completed ? state->completed : state->movecount));
(state->completed ? "COMPLETED! " : ""),
(state->completed ? state->completed : state->movecount));
- status_bar(
fe
, statusbuf);
+ status_bar(
dr
, statusbuf);
}
}
}
}
@@
-1682,14
+1682,17
@@
static float game_flash_length(game_state *oldstate,
return 0.0F;
}
return 0.0F;
}
-static int game_
wants_statusbar(void
)
+static int game_
timing_state(game_state *state, game_ui *ui
)
{
return TRUE;
}
{
return TRUE;
}
-static int game_timing_state(game_state *state, game_ui *ui)
+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
}
#ifdef COMBINED
@@
-1697,7
+1700,7
@@
static int game_timing_state(game_state *state, game_ui *ui)
#endif
const struct game thegame = {
#endif
const struct game thegame = {
- "Cube", "games.cube",
+ "Cube", "games.cube",
"cube",
default_params,
game_fetch_preset,
decode_params,
default_params,
game_fetch_preset,
decode_params,
@@
-1727,7
+1730,8
@@
const struct game thegame = {
game_redraw,
game_anim_length,
game_flash_length,
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,
FALSE, game_timing_state,
- 0, /*
mouse_prioritie
s */
+ 0, /*
flag
s */
};
};