diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index ffde2eaacb..528db84a6a 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -15,7 +15,8 @@ sm-ssc v1.2.3 | 201103?? 20110302 -------- -* [ScreenGameplaySyncMachine] Allow themes to use either .ssc or .sm files. [AJ] +* [ScreenGameplaySyncMachine] Allow themers to use either .ssc or .sm files. [AJ] +* [ScreenHowToPlay] Allow themers to use either .ssc or .sm files. [AJ] 20110301 -------- diff --git a/src/ScreenGameplaySyncMachine.cpp b/src/ScreenGameplaySyncMachine.cpp index 63895b18a9..165e7d02a8 100644 --- a/src/ScreenGameplaySyncMachine.cpp +++ b/src/ScreenGameplaySyncMachine.cpp @@ -20,7 +20,7 @@ void ScreenGameplaySyncMachine::Init() AdjustSync::ResetOriginalSyncData(); RString sFile = THEME->GetPathO("ScreenGameplaySyncMachine","music"); - // Allow themers to use .ssc and .sm files. -aj + // Allow themers to use either a .ssc or .sm file for this. -aj if(sFile.Right(4) == ".ssc") SSCLoader::LoadFromSSCFile( sFile, m_Song ); else diff --git a/src/ScreenHowToPlay.cpp b/src/ScreenHowToPlay.cpp index 44da5dd20c..70d79ce0c8 100644 --- a/src/ScreenHowToPlay.cpp +++ b/src/ScreenHowToPlay.cpp @@ -133,17 +133,19 @@ void ScreenHowToPlay::Init() ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName ); m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); - // Allow themers to use .ssc and .sm files. -aj - bool bLoadedSSCFile = SSCLoader::LoadFromSSCFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); - if( !bLoadedSSCFile ) - SMLoader::LoadFromSMFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); + // Allow themers to use either a .ssc or .sm file for this. -aj + RString sStepsPath = THEME->GetPathO(m_sName, "steps"); + if( sPath.Right(4) == ".ssc" ) + SSCLoader::LoadFromSSCFile( sStepsPath, m_Song, false ); + else + SMLoader::LoadFromSMFile( sStepsPath, m_Song, false ); m_Song.AddAutoGenNotes(); const Style* pStyle = GAMESTATE->GetCurrentStyle(); Steps *pSteps = SongUtil::GetStepsByDescription( &m_Song, pStyle->m_StepsType, "" ); // todo: make StepsType human readable. -aj - ASSERT_M( pSteps != NULL, ssprintf("StepsType %i is NULL", pStyle->m_StepsType) ); + ASSERT_M( pSteps != NULL, "No playable steps for ScreenHowToPlay" ); NoteData tempNoteData; pSteps->GetNoteData( tempNoteData );