zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Infrastructure change: game_anim_length and game_flash_length now

Browse Source 
both get passed a pointer to the game_ui. This means that if they
need to note down information for the redraw function about what
_type_ of flash or animation is required, they now have somewhere to
do so.

[originally from svn r5858]
This commit is contained in:
Simon Tatham
2005-05-30 07:55:27 +00:00
parent 8fa365a7b4
commit 0f423f0b3a
12 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cube.c
View File

@ -1526,13 +1526,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
return ROLLTIME;
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
return 0.0F;
}

4
fifteen.c
View File

@ -778,7 +778,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
if ((dir > 0 && newstate->just_used_solve) ||
(dir < 0 && oldstate->just_used_solve))
@ -788,7 +788,7 @@ static float game_anim_length(game_state *oldstate,
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->used_solve && !newstate->used_solve)

5
midend.c
View File

@ -212,7 +212,8 @@ static void midend_finish_move(midend_data *me)
flashtime = me->ourgame->flash_length(me->oldstate ? me->oldstate :
me->states[me->statepos-2].state,
me->states[me->statepos-1].state,
me->oldstate ? me->dir : +1);
me->oldstate ? me->dir : +1,
me->ui);
if (flashtime > 0) {
me->flash_pos = 0.0F;
me->flash_time = flashtime;
@ -333,7 +334,7 @@ static int midend_really_process_key(midend_data *me, int x, int y, int button)
} else {
anim_time = me->ourgame->anim_length(oldstate,
me->states[me->statepos-1].state,
me->dir);
me->dir, me->ui);
}
me->oldstate = oldstate;

4
net.c
View File

@ -2521,7 +2521,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
int last_rotate_dir;
@ -2544,7 +2544,7 @@ static float game_anim_length(game_state *oldstate,
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
/*
* If the game has just been completed, we display a completion

4
netslide.c
View File

@ -1683,7 +1683,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
/*
* Don't animate an auto-solve move.
@ -1696,7 +1696,7 @@ static float game_anim_length(game_state *oldstate,
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
/*
* If the game has just been completed, we display a completion

4
nullgame.c
View File

@ -199,13 +199,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
int dir)
int dir, game_ui *ui)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
int dir)
int dir, game_ui *ui)
{
return 0.0F;
}

4
pattern.c
View File

@ -1086,13 +1086,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->cheated && !newstate->cheated)

6
puzzles.h
View File

@ -219,8 +219,10 @@ struct game {
void (*redraw)(frontend *fe, game_drawstate *ds, game_state *oldstate,
game_state *newstate, int dir, game_ui *ui, float anim_time,
float flash_time);
float (*anim_length)(game_state *oldstate, game_state *newstate, int dir);
float (*flash_length)(game_state *oldstate, game_state *newstate, int dir);
float (*anim_length)(game_state *oldstate, game_state *newstate, int dir,
game_ui *ui);
float (*flash_length)(game_state *oldstate, game_state *newstate, int dir,
game_ui *ui);
int (*wants_statusbar)(void);
};

4
rect.c
View File

@ -2496,13 +2496,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->cheated && !newstate->cheated)

4
sixteen.c
View File

@ -937,7 +937,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
if ((dir > 0 && newstate->just_used_solve) ||
(dir < 0 && oldstate->just_used_solve))
@ -947,7 +947,7 @@ static float game_anim_length(game_state *oldstate,
}
static float game_flash_length(game_state *oldstate,
game_state *newstate, int dir)
game_state *newstate, int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->used_solve && !newstate->used_solve)

4
solo.c
View File

@ -2121,13 +2121,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
int dir)
int dir, game_ui *ui)
{
return 0.0F;
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
int dir)
int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->cheated && !newstate->cheated)

6
twiddle.c
View File

@ -942,7 +942,7 @@ static int highlight_colour(float angle)
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
int dir)
int dir, game_ui *ui)
{
if ((dir > 0 && newstate->just_used_solve) ||
(dir < 0 && oldstate->just_used_solve))
@ -952,7 +952,7 @@ static float game_anim_length(game_state *oldstate, game_state *newstate,
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
int dir)
int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->used_solve && !newstate->used_solve)
@ -1012,7 +1012,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
*/
if (oldstate) {
float angle;
float anim_max = game_anim_length(oldstate, state, dir);
float anim_max = game_anim_length(oldstate, state, dir, ui);
if (dir > 0) {
lastx = state->lastx;