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

[GameSoundManager] properly load .sm and .ssc files instead of assuming they're ssc files

Browse Source
This commit is contained in:
AJ Kelly
2011-03-29 15:13:59 -05:00
parent 9445f3391d
commit 6c4d9673f3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameSoundManager.cpp
+4 -2
View File
@@ -142,8 +142,9 @@ static void StartMusic( MusicToPlay &ToPlay )
{ {
LOG->Trace( "Found '%s'", ToPlay.m_sTimingFile.c_str() ); LOG->Trace( "Found '%s'", ToPlay.m_sTimingFile.c_str() );
Song song; Song song;
if( SSCLoader::LoadFromSSCFile(ToPlay.m_sTimingFile, song) ) if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".ssc" )
{ {
SSCLoader::LoadFromSSCFile(ToPlay.m_sTimingFile, song);
ToPlay.HasTiming = true; ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_Timing; ToPlay.m_TimingData = song.m_Timing;
// get cabinet lights if any // get cabinet lights if any
@@ -151,8 +152,9 @@ static void StartMusic( MusicToPlay &ToPlay )
if( pStepsCabinetLights ) if( pStepsCabinetLights )
pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData ); pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData );
} }
else if( SMLoader::LoadFromSMFile(ToPlay.m_sTimingFile, song) ) else if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".sm" )
{ {
SMLoader::LoadFromSMFile(ToPlay.m_sTimingFile, song);
ToPlay.HasTiming = true; ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_Timing; ToPlay.m_TimingData = song.m_Timing;
// get cabinet lights if any // get cabinet lights if any