From 4d327d32a5560724fdb2a6fa3d3d2ea2e4d52c22 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Sat, 17 Dec 2011 11:47:13 -0800 Subject: [PATCH] Make it possible to actually find all of SM's files on Windows. I know this had good intentions, but it was infuriating and confusing to everyone I've ever had to explain it to. %APPDATA% will work fine. --- src/arch/ArchHooks/ArchHooks_Win32Static.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/arch/ArchHooks/ArchHooks_Win32Static.cpp b/src/arch/ArchHooks/ArchHooks_Win32Static.cpp index c5251e6fb4..37487637a5 100644 --- a/src/arch/ArchHooks/ArchHooks_Win32Static.cpp +++ b/src/arch/ArchHooks/ArchHooks_Win32Static.cpp @@ -61,16 +61,23 @@ void ArchHooks::MountInitialFilesystems( const RString &sDirOfExecutable ) void ArchHooks::MountUserFilesystems( const RString &sDirOfExecutable ) { - RString sCommonAppDataDir = SpecialDirs::GetCommonAppDataDir() + PRODUCT_ID; + /* + * Look, I know what you're thinking: "Hey, let's put all this stuff into + * their respective 'proper' places on the filesystem!" Stop. Now. + * This was done before and it was the most ungodly confusing thing to ever + * happen. Just don't do it, seriously. Keep them in one place. + * - Colby + */ RString sAppDataDir = SpecialDirs::GetAppDataDir() + PRODUCT_ID; - RString sLocalAppDataDir = SpecialDirs::GetLocalAppDataDir() + PRODUCT_ID; - RString sPicturesDir = SpecialDirs::GetPicturesDir() + PRODUCT_ID; + //RString sCommonAppDataDir = SpecialDirs::GetCommonAppDataDir() + PRODUCT_ID; + //RString sLocalAppDataDir = SpecialDirs::GetLocalAppDataDir() + PRODUCT_ID; + //RString sPicturesDir = SpecialDirs::GetPicturesDir() + PRODUCT_ID; FILEMAN->Mount( "dir", sAppDataDir + "/Logs", "/Logs" ); FILEMAN->Mount( "dir", sAppDataDir + "/Save", "/Save" ); - FILEMAN->Mount( "dir", sPicturesDir + " /Screenshots", "/Screenshots" ); - FILEMAN->Mount( "dir", sCommonAppDataDir, "/" ); - FILEMAN->Mount( "dir", sCommonAppDataDir + "/Cache", "/Cache" ); + 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 ); }