80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

Revert "fixed creidts -> mainmenu transition"

Browse source 
This reverts commit 1ec7a1107d.
This commit is contained in:
Andrew "Akari" Alexeyew 2012-08-16 21:06:44 +03:00
parent 1ec7a1107d
commit 8cd260f961
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/credits.c
View file

@ -23,6 +23,7 @@ static struct {
CreditsEntry *entries;
int ecount;
float panelalpha;
float fadeout;
int end;
} credits;

3
src/menu/mainmenu.c
View file

@ -170,7 +170,6 @@ void draw_main_menu(MenuData *menu) {
}
void main_menu_loop(MenuData *menu) {
if(!transition_isset())
set_transition(TransFadeBlack, -1, FADE_TIME);
set_transition(TransFadeBlack, -1, FADE_TIME);
menu_loop(menu, NULL, draw_main_menu, NULL);
}

10
src/transition.c
View file

@ -20,8 +20,8 @@ float trans_fade(Transition *t) {
void TransFadeBlack(Transition *t) {
fade_out(trans_fade(t));
}
}
void TransFadeWhite(Transition *t) {
colorfill(1,1,1,trans_fade(t));
}
@ -47,7 +47,5 @@ void draw_transition(void) {
if(transition.frames > transition.dur1 + transition.dur2)
memset(&transition, 0, sizeof(Transition));
}
int transition_isset(void) {
return !!transition.rule;
}

3
src/transition.h
View file

@ -24,6 +24,5 @@ void TransFadeWhite(Transition *t);
void set_transition(TransitionRule rule, int dur1, int dur2);
void draw_transition(void);
int transition_isset(void);
#endif
#endif