diff --git a/src/graphics.c b/src/graphics.c index b5007df..ca7f480 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -15,6 +15,7 @@ #include "grays.h" #include "level.h" #include "keyselect.h" +#include "music.h" SDL_Surface* backdropSurface = NULL; @@ -169,7 +170,6 @@ void ShowTitle( void ) RetrieveResources( ); - MTicks time = MTickCount() + 120; SDLU_AcquireSurface( g_frontSurface ); DrawPICTInSurface( g_frontSurface, picTitle ); @@ -183,6 +183,11 @@ void ShowTitle( void ) } SDLU_ReleaseSurface( g_frontSurface ); + ChooseMusic( 13 ); + + QuickFadeIn( NULL ); + + MTicks time = MTickCount() + 150; while( time > MTickCount() && !SDLU_Button() ) { SDLU_Present(); diff --git a/src/main.c b/src/main.c index 7f628cd..084b0f5 100644 --- a/src/main.c +++ b/src/main.c @@ -323,7 +323,8 @@ int main(int argc, char *argv[]) ReserveMonitor( ); ShowTitle( ); - ChooseMusic( 13 ); + if ( GetCurrentMusic() != 13 ) + ChooseMusic( 13 ); while (!finished) { diff --git a/src/music.c b/src/music.c index 6428ef6..c67b2d2 100644 --- a/src/music.c +++ b/src/music.c @@ -64,6 +64,11 @@ void ResumeMusic( void ) } } +int GetCurrentMusic( void ) +{ + return musicSelection; +} + void ChooseMusic( short which ) { // Kill existing song first, if any diff --git a/src/music.h b/src/music.h index b300c08..ed8d917 100644 --- a/src/music.h +++ b/src/music.h @@ -6,6 +6,7 @@ void PauseMusic( void ); void ResumeMusic( void ); void FastMusic( void ); void SlowMusic( void ); +int GetCurrentMusic( void ); void ChooseMusic( short which ); void ShutdownMusic();