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

cosmetic

Browse Source
This commit is contained in:
Glenn Maynard
2007-06-03 04:12:58 +00:00
parent 2385dc342f
commit 0255e272c4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameSoundManager.cpp
+6 -6
View File
@@ -96,7 +96,7 @@ struct MusicToPlay
}
};
vector<MusicToPlay> g_MusicsToPlay;
static GameSoundManager::PlayMusicParams g_FallbackMusic;
static GameSoundManager::PlayMusicParams g_FallbackMusicParams;
static void StartMusic( MusicToPlay &ToPlay )
{
@@ -486,11 +486,11 @@ void GameSoundManager::Update( float fDeltaTime )
bool bIsPlaying = g_Playing->m_Music->IsPlaying();
g_Mutex->Unlock();
if( !bIsPlaying && g_bWasPlayingOnLastUpdate && !g_FallbackMusic.sFile.empty() )
if( !bIsPlaying && g_bWasPlayingOnLastUpdate && !g_FallbackMusicParams.sFile.empty() )
{
PlayMusic( g_FallbackMusic );
PlayMusic( g_FallbackMusicParams );
g_FallbackMusic.sFile = "";
g_FallbackMusicParams.sFile = "";
}
g_bWasPlayingOnLastUpdate = bIsPlaying;
}
@@ -684,9 +684,9 @@ void GameSoundManager::PlayMusic(
PlayMusic( params );
}
void GameSoundManager::PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusic )
void GameSoundManager::PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusicParams )
{
g_FallbackMusic = FallbackMusic;
g_FallbackMusicParams = FallbackMusicParams;
// LOG->Trace("play '%s' (current '%s')", file.c_str(), g_Playing->m_Music->GetLoadedFilePath().c_str());