~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Permit users to reconfigure the default setting for each puzzle using
[sgt/puzzles]
/
fifteen.c
diff --git
a/fifteen.c
b/fifteen.c
index
20ceb4b
..
5419f41
100644
(file)
--- a/
fifteen.c
+++ b/
fifteen.c
@@
-42,7
+42,6
@@
struct game_state {
int *tiles;
int gap_pos;
int completed;
int *tiles;
int gap_pos;
int completed;
- int just_used_solve; /* used to suppress undo animation */
int used_solve; /* used to suppress completion flash */
int movecount;
};
int used_solve; /* used to suppress completion flash */
int movecount;
};
@@
-58,6
+57,11
@@
static game_params *default_params(void)
static int game_fetch_preset(int i, char **name, game_params **params)
{
static int game_fetch_preset(int i, char **name, game_params **params)
{
+ if (i == 0) {
+ *params = default_params();
+ *name = dupstr("4x4");
+ return TRUE;
+ }
return FALSE;
}
return FALSE;
}
@@
-318,7
+322,7
@@
static char *validate_desc(game_params *params, char *desc)
return err;
}
return err;
}
-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 i;
{
game_state *state = snew(game_state);
int i;
@@
-345,7
+349,7
@@
static game_state *new_game(midend_data *me, game_params *params, char *desc)
assert(state->tiles[state->gap_pos] == 0);
state->completed = state->movecount = 0;
assert(state->tiles[state->gap_pos] == 0);
state->completed = state->movecount = 0;
- state->used_solve =
state->just_used_solve =
FALSE;
+ state->used_solve = FALSE;
return state;
}
return state;
}
@@
-363,7
+367,6
@@
static game_state *dup_game(game_state *state)
ret->completed = state->completed;
ret->movecount = state->movecount;
ret->used_solve = state->used_solve;
ret->completed = state->completed;
ret->movecount = state->movecount;
ret->used_solve = state->used_solve;
- ret->just_used_solve = state->just_used_solve;
return ret;
}
return ret;
}
@@
-380,6
+383,11
@@
static char *solve_game(game_state *state, game_state *currstate,
return dupstr("S");
}
return dupstr("S");
}
+static int game_can_format_as_text_now(game_params *params)
+{
+ return TRUE;
+}
+
static char *game_text_format(game_state *state)
{
char *ret, *p, buf[80];
static char *game_text_format(game_state *state)
{
char *ret, *p, buf[80];
@@
-509,7
+517,7
@@
static game_state *execute_move(game_state *from, char *move)
for (i = 0; i < ret->n; i++)
ret->tiles[i] = (i+1) % ret->n;
ret->gap_pos = ret->n-1;
for (i = 0; i < ret->n; i++)
ret->tiles[i] = (i+1) % ret->n;
ret->gap_pos = ret->n-1;
- ret->used_solve =
ret->just_used_solve =
TRUE;
+ ret->used_solve = TRUE;
ret->completed = ret->movecount = 1;
return ret;
ret->completed = ret->movecount = 1;
return ret;
@@
-533,7
+541,6
@@
static game_state *execute_move(game_state *from, char *move)
up = C(from, ux, uy);
ret = dup_game(from);
up = C(from, ux, uy);
ret = dup_game(from);
- ret->just_used_solve = FALSE; /* zero this in a hurry */
ret->gap_pos = C(from, dx, dy);
assert(ret->gap_pos >= 0 && ret->gap_pos < ret->n);
ret->gap_pos = C(from, dx, dy);
assert(ret->gap_pos >= 0 && ret->gap_pos < ret->n);
@@
-574,13
+581,13
@@
static void game_compute_size(game_params *params, int tilesize,
*y = TILE_SIZE * params->h + 2 * BORDER;
}
*y = TILE_SIZE * params->h + 2 * BORDER;
}
-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)
{
ds->tilesize = tilesize;
}
{
ds->tilesize = tilesize;
}
-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);
int i;
{
float *ret = snewn(3 * NCOLOURS, float);
int i;
@@
-594,7
+601,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);
int i;
{
struct game_drawstate *ds = snew(struct game_drawstate);
int i;
@@
-611,17
+618,17
@@
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->tiles);
sfree(ds);
}
{
sfree(ds->tiles);
sfree(ds);
}
-static void draw_tile(
frontend *fe
, game_drawstate *ds, game_state *state,
+static void draw_tile(
drawing *dr
, game_drawstate *ds, game_state *state,
int x, int y, int tile, int flash_colour)
{
if (tile == 0) {
int x, int y, int tile, int flash_colour)
{
if (tile == 0) {
- draw_rect(
fe
, x, y, TILE_SIZE, TILE_SIZE,
+ draw_rect(
dr
, x, y, TILE_SIZE, TILE_SIZE,
flash_colour);
} else {
int coords[6];
flash_colour);
} else {
int coords[6];
@@
-633,25
+640,25
@@
static void draw_tile(frontend *fe, game_drawstate *ds, game_state *state,
coords[3] = y;
coords[4] = x;
coords[5] = y + TILE_SIZE - 1;
coords[3] = y;
coords[4] = x;
coords[5] = y + TILE_SIZE - 1;
- draw_polygon(
fe
, coords, 3, COL_LOWLIGHT, COL_LOWLIGHT);
+ draw_polygon(
dr
, coords, 3, COL_LOWLIGHT, COL_LOWLIGHT);
coords[0] = x;
coords[1] = y;
coords[0] = x;
coords[1] = y;
- draw_polygon(
fe
, coords, 3, COL_HIGHLIGHT, COL_HIGHLIGHT);
+ draw_polygon(
dr
, coords, 3, COL_HIGHLIGHT, COL_HIGHLIGHT);
- draw_rect(
fe
, x + HIGHLIGHT_WIDTH, y + HIGHLIGHT_WIDTH,
+ draw_rect(
dr
, x + HIGHLIGHT_WIDTH, y + HIGHLIGHT_WIDTH,
TILE_SIZE - 2*HIGHLIGHT_WIDTH, TILE_SIZE - 2*HIGHLIGHT_WIDTH,
flash_colour);
sprintf(str, "%d", tile);
TILE_SIZE - 2*HIGHLIGHT_WIDTH, TILE_SIZE - 2*HIGHLIGHT_WIDTH,
flash_colour);
sprintf(str, "%d", tile);
- draw_text(
fe
, x + TILE_SIZE/2, y + TILE_SIZE/2,
+ draw_text(
dr
, x + TILE_SIZE/2, y + TILE_SIZE/2,
FONT_VARIABLE, TILE_SIZE/3, ALIGN_VCENTRE | ALIGN_HCENTRE,
COL_TEXT, str);
}
FONT_VARIABLE, TILE_SIZE/3, ALIGN_VCENTRE | ALIGN_HCENTRE,
COL_TEXT, str);
}
- draw_update(
fe
, x, y, TILE_SIZE, TILE_SIZE);
+ draw_update(
dr
, x, y, TILE_SIZE, TILE_SIZE);
}
}
-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)
{
@@
-666,10
+673,10
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
if (!ds->started) {
int coords[10];
if (!ds->started) {
int coords[10];
- draw_rect(
fe
, 0, 0,
+ draw_rect(
dr
, 0, 0,
TILE_SIZE * state->w + 2 * BORDER,
TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND);
TILE_SIZE * state->w + 2 * BORDER,
TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND);
- draw_update(
fe
, 0, 0,
+ draw_update(
dr
, 0, 0,
TILE_SIZE * state->w + 2 * BORDER,
TILE_SIZE * state->h + 2 * BORDER);
TILE_SIZE * state->w + 2 * BORDER,
TILE_SIZE * state->h + 2 * BORDER);
@@
-686,11
+693,11
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
coords[9] = COORD(state->h) + HIGHLIGHT_WIDTH - 1;
coords[6] = coords[8] + TILE_SIZE;
coords[7] = coords[9] - TILE_SIZE;
coords[9] = COORD(state->h) + HIGHLIGHT_WIDTH - 1;
coords[6] = coords[8] + TILE_SIZE;
coords[7] = coords[9] - TILE_SIZE;
- draw_polygon(
fe
, coords, 5, COL_HIGHLIGHT, COL_HIGHLIGHT);
+ draw_polygon(
dr
, coords, 5, COL_HIGHLIGHT, COL_HIGHLIGHT);
coords[1] = COORD(0) - HIGHLIGHT_WIDTH;
coords[0] = COORD(0) - HIGHLIGHT_WIDTH;
coords[1] = COORD(0) - HIGHLIGHT_WIDTH;
coords[0] = COORD(0) - HIGHLIGHT_WIDTH;
- draw_polygon(
fe
, coords, 5, COL_LOWLIGHT, COL_LOWLIGHT);
+ draw_polygon(
dr
, coords, 5, COL_LOWLIGHT, COL_LOWLIGHT);
ds->started = TRUE;
}
ds->started = TRUE;
}
@@
-775,7
+782,7
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
y = COORD(Y(state, i));
}
y = COORD(Y(state, i));
}
- draw_tile(
fe
, ds, state, x, y, t, bgcolour);
+ draw_tile(
dr
, ds, state, x, y, t, bgcolour);
}
ds->tiles[i] = t0;
}
}
ds->tiles[i] = t0;
}
@@
-803,18
+810,14
@@
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);
}
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir, game_ui *ui)
{
}
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir, game_ui *ui)
{
- if ((dir > 0 && newstate->just_used_solve) ||
- (dir < 0 && oldstate->just_used_solve))
- return 0.0F;
- else
- return ANIM_TIME;
+ return ANIM_TIME;
}
static float game_flash_length(game_state *oldstate,
}
static float game_flash_length(game_state *oldstate,
@@
-827,9
+830,9
@@
static float game_flash_length(game_state *oldstate,
return 0.0F;
}
return 0.0F;
}
-static int game_
wants_statusbar(void
)
+static int game_
status(game_state *state
)
{
{
- return
TRUE
;
+ return
state->completed ? +1 : 0
;
}
static int game_timing_state(game_state *state, game_ui *ui)
}
static int game_timing_state(game_state *state, game_ui *ui)
@@
-837,12
+840,20
@@
static int game_timing_state(game_state *state, game_ui *ui)
return TRUE;
}
return TRUE;
}
+static void game_print_size(game_params *params, float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, game_state *state, int tilesize)
+{
+}
+
#ifdef COMBINED
#define thegame fifteen
#endif
const struct game thegame = {
#ifdef COMBINED
#define thegame fifteen
#endif
const struct game thegame = {
- "Fifteen", "games.fifteen",
+ "Fifteen", "games.fifteen",
"fifteen",
default_params,
game_fetch_preset,
decode_params,
default_params,
game_fetch_preset,
decode_params,
@@
-857,7
+868,7
@@
const struct game thegame = {
dup_game,
free_game,
TRUE, solve_game,
dup_game,
free_game,
TRUE, solve_game,
- TRUE, game_text_format,
+ TRUE, game_
can_format_as_text_now, game_
text_format,
new_ui,
free_ui,
encode_ui,
new_ui,
free_ui,
encode_ui,
@@
-872,7
+883,9
@@
const struct game thegame = {
game_redraw,
game_anim_length,
game_flash_length,
game_redraw,
game_anim_length,
game_flash_length,
- game_wants_statusbar,
+ game_status,
+ 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 */
};
};