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

change how these are compared by putting the load in the condition too

Browse Source
This commit is contained in:
AJ Kelly
2011-03-29 23:50:41 -05:00
parent 53dea206f4
commit b91dc69043
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameSoundManager.cpp
+4 -4
View File
@@ -142,9 +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( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".ssc" ) if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".ssc" &&
SSCLoader::LoadFromSSCFile(ToPlay.m_sTimingFile, song) )
{ {
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
@@ -152,9 +152,9 @@ static void StartMusic( MusicToPlay &ToPlay )
if( pStepsCabinetLights ) if( pStepsCabinetLights )
pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData ); pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData );
} }
else if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".sm" ) else if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".sm" &&
SMLoader::LoadFromSMFile(ToPlay.m_sTimingFile, song) )
{ {
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