actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix attract music logic

Browse Source
This commit is contained in:
Glenn Maynard
2005-03-22 22:53:39 +00:00
parent 4c953a5f03
commit 59b59214e9
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenAttract.cpp
+12 -8
View File
@@ -108,15 +108,19 @@ void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventTy
// Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
}
void ScreenAttract::StartPlayingMusic()
{
if( !GAMESTATE->IsTimeToPlayAttractSounds() )
{
SOUND->PlayMusic( "" ); // stop music
return;
}
ScreenWithMenuElements::StartPlayingMusic();
}
void ScreenAttract::Update( float fDelta )
{
if( IsFirstUpdate() )
{
if( GAMESTATE->IsTimeToPlayAttractSounds() )
SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
else
SOUND->PlayMusic( "" ); // stop music
}
ScreenWithMenuElements::Update(fDelta);
}
@@ -135,7 +139,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
* going to interrupt it when we fade in, stop the old music before we fade out. */
bool bMusicChanging = false;
if( PLAY_MUSIC )
bMusicChanging = THEME->GetPathS(NEXT_SCREEN,"music") != THEME->GetPathS(m_sName,"music",true); // GetPath optional on the next screen because it may not have music.
bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(NEXT_SCREEN,"music",true); // GetPath optional on the next screen because it may not have music.
if( bMusicChanging )
SOUND->PlayMusic( "" ); // stop the music