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

Get SSCLoader used when appropriate.

Browse Source
This commit is contained in:
Jason Felds
2011-02-11 00:10:57 -05:00
parent dbcfcd0cfc
commit 565b9f9306
10 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoader.cpp
+7 -3
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "NotesLoader.h"
#include "NotesLoaderSM.h"
#include "NotesLoaderSSC.h"
#include "NotesLoaderDWI.h"
#include "NotesLoaderBMS.h"
#include "NotesLoaderPMS.h"
@@ -30,14 +31,17 @@ bool NotesLoader::LoadFromDir( const RString &sPath, Song &out, set<RString> &Bl
vector<RString> list;
BlacklistedImages.clear();
SMLoader::GetApplicableFiles( sPath, list );
SSCLoader::GetApplicableFiles( sPath, list );
if( !list.empty() )
{
if( !SMLoader::LoadFromDir(sPath, out) )
if( !SSCLoader::LoadFromDir( sPath, out ) )
return false;
SMLoader::TidyUpData( out, false );
SSCLoader::TidyUpData( out, false );
return true;
}
SMLoader::GetApplicableFiles( sPath, list );
if (!list.empty() )
return SMLoader::LoadFromDir( sPath, out );
DWILoader::GetApplicableFiles( sPath, list );
if( !list.empty() )
return DWILoader::LoadFromDir( sPath, out, BlacklistedImages );