~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Ben Hutchings to allow user-initiated tilesize changes to persist
[sgt/puzzles]
/
sixteen.c
diff --git
a/sixteen.c
b/sixteen.c
index
51771a8
..
f16bc96
100644
(file)
--- a/
sixteen.c
+++ b/
sixteen.c
@@
-44,7
+44,6
@@
struct game_state {
int w, h, n;
int *tiles;
int completed;
int w, h, n;
int *tiles;
int completed;
- int just_used_solve; /* used to suppress undo animation */
int used_solve; /* used to suppress completion flash */
int movecount, movetarget;
int last_movement_sense;
int used_solve; /* used to suppress completion flash */
int movecount, movetarget;
int last_movement_sense;
@@
-474,7
+473,7
@@
static game_state *new_game(midend *me, game_params *params, char *desc)
state->completed = state->movecount = 0;
state->movetarget = params->movetarget;
state->completed = state->movecount = 0;
state->movetarget = params->movetarget;
- state->used_solve =
state->just_used_solve =
FALSE;
+ state->used_solve = FALSE;
state->last_movement_sense = 0;
return state;
state->last_movement_sense = 0;
return state;
@@
-493,7
+492,6
@@
static game_state *dup_game(game_state *state)
ret->movecount = state->movecount;
ret->movetarget = state->movetarget;
ret->used_solve = state->used_solve;
ret->movecount = state->movecount;
ret->movetarget = state->movetarget;
ret->used_solve = state->used_solve;
- ret->just_used_solve = state->just_used_solve;
ret->last_movement_sense = state->last_movement_sense;
return ret;
ret->last_movement_sense = state->last_movement_sense;
return ret;
@@
-636,7
+634,7
@@
static game_state *execute_move(game_state *from, char *move)
*/
for (i = 0; i < ret->n; i++)
ret->tiles[i] = i+1;
*/
for (i = 0; i < ret->n; i++)
ret->tiles[i] = i+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;
@@
-654,7
+652,6
@@
static game_state *execute_move(game_state *from, char *move)
return NULL;
ret = dup_game(from);
return NULL;
ret = dup_game(from);
- ret->just_used_solve = FALSE; /* zero this in a hurry */
do {
tx = (cx - dx + from->w) % from->w;
do {
tx = (cx - dx + from->w) % from->w;
@@
-702,7
+699,7
@@
static void game_set_size(drawing *dr, game_drawstate *ds,
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;
@@
-986,11
+983,7
@@
static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
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,
@@
-1003,11
+996,6
@@
static float game_flash_length(game_state *oldstate,
return 0.0F;
}
return 0.0F;
}
-static int game_wants_statusbar(void)
-{
- return TRUE;
-}
-
static int game_timing_state(game_state *state, game_ui *ui)
{
return TRUE;
static int game_timing_state(game_state *state, game_ui *ui)
{
return TRUE;
@@
-1026,7
+1014,7
@@
static void game_print(drawing *dr, game_state *state, int tilesize)
#endif
const struct game thegame = {
#endif
const struct game thegame = {
- "Sixteen", "games.sixteen",
+ "Sixteen", "games.sixteen",
"sixteen",
default_params,
game_fetch_preset,
decode_params,
default_params,
game_fetch_preset,
decode_params,
@@
-1057,7
+1045,7
@@
const struct game thegame = {
game_anim_length,
game_flash_length,
FALSE, FALSE, game_print_size, game_print,
game_anim_length,
game_flash_length,
FALSE, FALSE, game_print_size, game_print,
- game_wants_statusbar,
+ TRUE, /* wants_statusbar */
FALSE, game_timing_state,
FALSE, game_timing_state,
- 0, /*
mouse_prioritie
s */
+ 0, /*
flag
s */
};
};