From a3b837c69845e5ccfd3bc29ee72c9b3e6ea9adec Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 22 Oct 2005 17:00:35 +0000 Subject: Cleanup: remove the `just_used_solve' field from a number of games which didn't actually need it. It was originally introduced in Fifteen to suppress animation on Solve moves, but midend.c now does that centrally unless the game specifically instructs it otherwise. Therefore, just_used_solve is obsolete in all games which previously used it. (Mines was even worse: it scrupulously maintained the correctness of the field but never used it!) Untangle is exempt from this cleanup: its `just_solved' field is used to change the _length_ of the animation on Solve moves, not to suppress it entirely, and so it has to stay. [originally from svn r6419] --- netslide.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'netslide.c') diff --git a/netslide.c b/netslide.c index 310d26d..d935b95 100644 --- a/netslide.c +++ b/netslide.c @@ -84,7 +84,7 @@ struct game_params { struct game_state { int width, height, cx, cy, wrapping, completed; - int used_solve, just_used_solve; + int used_solve; int move_count, movetarget; /* position (row or col number, starting at 0) of last move. */ @@ -745,7 +745,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc) state->wrapping = params->wrapping; state->movetarget = params->movetarget; state->completed = 0; - state->used_solve = state->just_used_solve = FALSE; + state->used_solve = FALSE; state->move_count = 0; state->last_move_row = -1; state->last_move_col = -1; @@ -865,7 +865,6 @@ static game_state *dup_game(game_state *state) ret->movetarget = state->movetarget; ret->completed = state->completed; ret->used_solve = state->used_solve; - ret->just_used_solve = state->just_used_solve; ret->move_count = state->move_count; ret->last_move_row = state->last_move_row; ret->last_move_col = state->last_move_col; @@ -1111,7 +1110,7 @@ static game_state *execute_move(game_state *from, char *move) strlen(move) == from->width * from->height + 1) { int i; ret = dup_game(from); - ret->used_solve = ret->just_used_solve = TRUE; + ret->used_solve = TRUE; ret->completed = ret->move_count = 1; for (i = 0; i < from->width * from->height; i++) { @@ -1133,7 +1132,6 @@ static game_state *execute_move(game_state *from, char *move) return NULL; /* can't parse move string */ ret = dup_game(from); - ret->just_used_solve = FALSE; if (col) slide_col(ret, d, c); @@ -1736,13 +1734,6 @@ 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) { - /* - * Don't animate an auto-solve move. - */ - if ((dir > 0 && newstate->just_used_solve) || - (dir < 0 && oldstate->just_used_solve)) - return 0.0F; - return ANIM_TIME; } -- cgit v1.1