From a279bd3c15dde57e28dcc775c0b186613800f506 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 5 Dec 2003 02:27:38 +0000 Subject: [PATCH] more transparent m_asAdditionalSongFolders --- stepmania/src/SongManager.cpp | 13 ------------- stepmania/src/StepMania.cpp | 4 ++++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 0da3d69f6e..e4f8aeb45d 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -147,9 +147,6 @@ void SongManager::InitSongsFromDisk( LoadingWindow *ld ) RageTimer tm; LoadStepManiaSongDir( SONGS_DIR, ld ); - for( unsigned i=0; im_asAdditionalSongFolders.size(); i++ ) - LoadStepManiaSongDir( PREFSMAN->m_asAdditionalSongFolders[i], ld ); - if( PREFSMAN->m_DWIPath != "" ) LoadStepManiaSongDir( PREFSMAN->m_DWIPath + "/Songs", ld ); @@ -1147,16 +1144,6 @@ bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredG { const CString sCourseSuffix = sPreferredGroup + SLASH + (bExtra2 ? "extra2" : "extra1") + ".crs"; CString sCoursePath = SONGS_DIR + sCourseSuffix; - if( !DoesFileExist(sCoursePath) ) - { - /* try alternative song folders */ - for( unsigned i=0; im_asAdditionalSongFolders.size(); i++ ) - { - sCoursePath = PREFSMAN->m_asAdditionalSongFolders[i] + SLASH + sCourseSuffix; - if( DoesFileExist(sCoursePath) ) - break; - } - } if( !DoesFileExist(sCoursePath) && PREFSMAN->m_DWIPath.size() ) sCoursePath = PREFSMAN->m_DWIPath + SLASH "Songs" SLASH + sCourseSuffix; diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index b3502ac34b..a0f8cbd6fd 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -825,6 +825,10 @@ int main(int argc, char* argv[]) CheckSettings(); + /* Set up alternative filesystem trees. */ + for( unsigned i=0; im_asAdditionalSongFolders.size(); i++ ) + FILEMAN->Mount( "dir", PREFSMAN->m_asAdditionalSongFolders[i], "Songs" ); + GAMEMAN = new GameManager; THEME = new ThemeManager; ANNOUNCER = new AnnouncerManager;