From ca1cdbabb00afa3f0c4b3ee97149b0b05ddfc1e0 Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Sat, 7 Sep 2013 10:53:33 -0400 Subject: [PATCH] Make mount ArchHooks match across platforms --- src/arch/ArchHooks/ArchHooks_MacOSX.cpp | 2 +- src/arch/ArchHooks/ArchHooks_Unix.cpp | 4 ++-- src/arch/ArchHooks/ArchHooks_Win32Static.cpp | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/arch/ArchHooks/ArchHooks_MacOSX.cpp b/src/arch/ArchHooks/ArchHooks_MacOSX.cpp index 79e74d9be1..5c9f9013d9 100644 --- a/src/arch/ArchHooks/ArchHooks_MacOSX.cpp +++ b/src/arch/ArchHooks/ArchHooks_MacOSX.cpp @@ -426,7 +426,7 @@ void ArchHooks::MountUserFilesystems( const RString &sDirOfExecutable ) FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/CDTitles", dir), "/CDTitles" ); FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/Characters", dir), "/Characters" ); FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/Courses", dir), "/Courses" ); - FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/Noteskins", dir), "/Noteskins" ); + FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/NoteSkins", dir), "/NoteSkins" ); FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/Packages", dir), "/" + SpecialFiles::USER_PACKAGES_DIR ); FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/Songs", dir), "/Songs" ); FILEMAN->Mount( "dir", ssprintf("%s/" PRODUCT_ID "/RandomMovies", dir), "/RandomMovies" ); diff --git a/src/arch/ArchHooks/ArchHooks_Unix.cpp b/src/arch/ArchHooks/ArchHooks_Unix.cpp index d835de1c1e..2a9b2f8407 100644 --- a/src/arch/ArchHooks/ArchHooks_Unix.cpp +++ b/src/arch/ArchHooks/ArchHooks_Unix.cpp @@ -327,8 +327,8 @@ void ArchHooks::MountUserFilesystems( const RString &sDirOfExecutable ) FILEMAN->Mount( "dir", sUserDataPath + "/Characters", "/Characters" ); FILEMAN->Mount( "dir", sUserDataPath + "/Courses", "/Courses" ); FILEMAN->Mount( "dir", sUserDataPath + "/Logs", "/Logs" ); - FILEMAN->Mount( "dir", sUserDataPath + "/Noteskins", "/Noteskins" ); - FILEMAN->Mount( "dir", sUserDataPath + "/Packages", "/Packages" ); + FILEMAN->Mount( "dir", sUserDataPath + "/NoteSkins", "/NoteSkins" ); + FILEMAN->Mount( "dir", sUserDataPath + "/Packages", "/" + SpecialFiles::USER_PACKAGES_DIR ); FILEMAN->Mount( "dir", sUserDataPath + "/Save", "/Save" ); FILEMAN->Mount( "dir", sUserDataPath + "/Screenshots", "/Screenshots" ); FILEMAN->Mount( "dir", sUserDataPath + "/Songs", "/Songs" ); diff --git a/src/arch/ArchHooks/ArchHooks_Win32Static.cpp b/src/arch/ArchHooks/ArchHooks_Win32Static.cpp index 37487637a5..9e6ce39a6a 100644 --- a/src/arch/ArchHooks/ArchHooks_Win32Static.cpp +++ b/src/arch/ArchHooks/ArchHooks_Win32Static.cpp @@ -73,12 +73,22 @@ void ArchHooks::MountUserFilesystems( const RString &sDirOfExecutable ) //RString sLocalAppDataDir = SpecialDirs::GetLocalAppDataDir() + PRODUCT_ID; //RString sPicturesDir = SpecialDirs::GetPicturesDir() + PRODUCT_ID; + FILEMAN->Mount( "dir", sAppDataDir + "/Announcers", "/Announcers" ); + FILEMAN->Mount( "dir", sAppDataDir + "/BGAnimations", "/BGAnimations" ); + FILEMAN->Mount( "dir", sAppDataDir + "/BackgroundEffects", "/BackgroundEffects" ); + FILEMAN->Mount( "dir", sAppDataDir + "/BackgroundTransitions", "/BackgroundTransitions" ); + FILEMAN->Mount( "dir", sAppDataDir + "/Cache", "/Cache" ); + FILEMAN->Mount( "dir", sAppDataDir + "/CDTitles", "/CDTitles" ); + FILEMAN->Mount( "dir", sAppDataDir + "/Characters", "/Characters" ); + FILEMAN->Mount( "dir", sAppDataDir + "/Courses", "/Courses" ); FILEMAN->Mount( "dir", sAppDataDir + "/Logs", "/Logs" ); + FILEMAN->Mount( "dir", sAppDataDir + "/NoteSkins", "/NoteSkins" ); + FILEMAN->Mount( "dir", sAppDataDir + "/Packages", "/" + SpecialFiles::USER_PACKAGES_DIR ); FILEMAN->Mount( "dir", sAppDataDir + "/Save", "/Save" ); FILEMAN->Mount( "dir", sAppDataDir + "/Screenshots", "/Screenshots" ); - FILEMAN->Mount( "dir", sAppDataDir, "/" ); - FILEMAN->Mount( "dir", sAppDataDir + "/Cache", "/Cache" ); - FILEMAN->Mount( "dir", sAppDataDir + "/Packages", "/" + SpecialFiles::USER_PACKAGES_DIR ); + FILEMAN->Mount( "dir", sAppDataDir + "/Songs", "/Songs" ); + FILEMAN->Mount( "dir", sAppDataDir + "/RandomMovies", "/RandomMovies" ); + FILEMAN->Mount( "dir", sAppDataDir + "/Themes", "/Themes" ); } static RString LangIdToString( LANGID l )