New branch: [notesloader]

Time to better unify our files and refactor properly.
This commit is contained in:
Jason Felds
2011-06-09 13:46:30 -04:00
parent 0fa0d42549
commit b6bf776716
12 changed files with 53 additions and 42 deletions
+4 -2
View File
@@ -242,11 +242,13 @@ void Steps::Decompress() const
{
// We have data on disk and not in memory. Load it.
Song s;
bool bLoadedFromSSC = SSCLoader::LoadFromSSCFile(m_sFilename, s, true);
SSCLoader loaderSSC;
bool bLoadedFromSSC = loaderSSC.LoadFromSSCFile(m_sFilename, s, true);
if( !bLoadedFromSSC )
{
// try reading from .sm instead
if( !SMLoader::LoadFromSMFile(m_sFilename, s, true) )
SMLoader loaderSM;
if( !loaderSM.LoadFromSMFile(m_sFilename, s, true) )
{
LOG->Warn( "Couldn't load \"%s\"", m_sFilename.c_str() );
return;