From ce043d595be248c2c98a779f55548ec6071dbf77 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 13 Feb 2011 16:55:51 -0600 Subject: [PATCH] allow themers to use .sm files as well as .ssc files for ScreenHowToPlay. --- src/ScreenHowToPlay.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ScreenHowToPlay.cpp b/src/ScreenHowToPlay.cpp index 0ffbadd34c..16ddba07a2 100644 --- a/src/ScreenHowToPlay.cpp +++ b/src/ScreenHowToPlay.cpp @@ -4,6 +4,7 @@ #include "GameState.h" #include "Steps.h" #include "GameManager.h" +#include "NotesLoaderSM.h" #include "NotesLoaderSSC.h" #include "GameSoundManager.h" #include "Model.h" @@ -132,7 +133,10 @@ void ScreenHowToPlay::Init() ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName ); m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); - SSCLoader::LoadFromSSCFile( THEME->GetPathO(m_sName, "steps"), m_Song, false ); + // 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 ); m_Song.AddAutoGenNotes(); const Style* pStyle = GAMESTATE->GetCurrentStyle();