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
+5 -3
View File
@@ -235,12 +235,14 @@ bool Song::LoadFromSongDir( RString sDir )
if( bUseCache )
{
// LOG->Trace( "Loading '%s' from cache file '%s'.", m_sSongDir.c_str(), GetCacheFilePath().c_str() );
bool bLoadedFromSSC = SSCLoader::LoadFromSSCFile( sCacheFilePath, *this, true );
SSCLoader loaderSSC;
bool bLoadedFromSSC = loaderSSC.LoadFromSSCFile( sCacheFilePath, *this, true );
if( !bLoadedFromSSC )
{
// load from .sm
SMLoader::LoadFromSMFile( sCacheFilePath, *this, true );
SMLoader::TidyUpData( *this, true );
SMLoader loaderSM;
loaderSM.LoadFromSMFile( sCacheFilePath, *this, true );
loaderSM.TidyUpData( *this, true );
}
}
else