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

Minor formatting cleanup

Browse Source
This commit is contained in:
Ben "root" Anderson
2013-11-14 12:03:15 -06:00
parent a3e241f471
commit 5124186c42
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongManager.cpp
+30 -34
View File
@@ -1711,50 +1711,46 @@ void SongManager::RefreshCourseGroupInfo()
void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, ProfileSlot slot ) void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, ProfileSlot slot )
{ {
// Load all edit steps
RString sDir = sProfileDir + EDIT_STEPS_SUBDIR;
vector<RString> vsFiles;
GetDirListing( sDir+"*.edit", vsFiles, false, true );
int iNumEditsLoaded = GetNumEditsLoadedFromProfile( slot );
int size = min( (int) vsFiles.size(), MAX_EDIT_STEPS_PER_PROFILE - iNumEditsLoaded );
for( int i=0; i<size; i++ )
{ {
// Load all edit steps RString fn = vsFiles[i];
RString sDir = sProfileDir + EDIT_STEPS_SUBDIR; SSCLoader loaderSSC;
bool bLoadedFromSSC = loaderSSC.LoadEditFromFile( fn, slot, true );
vector<RString> vsFiles; // If we don't load the edit from a .ssc-style .edit, then we should
GetDirListing( sDir+"*.edit", vsFiles, false, true ); // also try the .sm-style edit file. -aj
if( !bLoadedFromSSC )
int iNumEditsLoaded = GetNumEditsLoadedFromProfile( slot );
int size = min( (int) vsFiles.size(), MAX_EDIT_STEPS_PER_PROFILE - iNumEditsLoaded );
for( int i=0; i<size; i++ )
{ {
RString fn = vsFiles[i]; SMLoader loaderSM;
SSCLoader loaderSSC; loaderSM.LoadEditFromFile( fn, slot, true );
bool bLoadedFromSSC = loaderSSC.LoadEditFromFile( fn, slot, true );
// If we don't load the edit from a .ssc-style .edit, then we should
// also try the .sm-style edit file. -aj
if( !bLoadedFromSSC )
{
SMLoader loaderSM;
loaderSM.LoadEditFromFile( fn, slot, true );
}
} }
} }
} }
void SongManager::LoadCourseEditsFromProfileDir( const RString &sProfileDir, ProfileSlot slot ) void SongManager::LoadCourseEditsFromProfileDir( const RString &sProfileDir, ProfileSlot slot )
{ {
// Load all edit courses
RString sDir = sProfileDir + EDIT_COURSES_SUBDIR;
vector<RString> vsFiles;
GetDirListing( sDir+"*.crs", vsFiles, false, true );
int iNumEditsLoaded = GetNumEditsLoadedFromProfile( slot );
int size = min( (int) vsFiles.size(), MAX_EDIT_COURSES_PER_PROFILE - iNumEditsLoaded );
for( int i=0; i<size; i++ )
{ {
// Load all edit courses RString fn = vsFiles[i];
RString sDir = sProfileDir + EDIT_COURSES_SUBDIR;
vector<RString> vsFiles; CourseLoaderCRS::LoadEditFromFile( fn, slot );
GetDirListing( sDir+"*.crs", vsFiles, false, true );
int iNumEditsLoaded = GetNumEditsLoadedFromProfile( slot );
int size = min( (int) vsFiles.size(), MAX_EDIT_COURSES_PER_PROFILE - iNumEditsLoaded );
for( int i=0; i<size; i++ )
{
RString fn = vsFiles[i];
CourseLoaderCRS::LoadEditFromFile( fn, slot );
}
} }
} }