diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index a041c07f05..5cf8835454 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -71,6 +71,7 @@ #define BACKUP_DIR "Backup" #define RESOURCEPACK_DIR "ResourcePacks" #define DYNAMICINPUT_DIR "DynamicInputTextures" +#define SLIPPI_DIR "Slippi" // This one is only used to remove it if it was present #define SHADERCACHE_LEGACY_DIR "ShaderCache" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 6ee7e0bb32..ba063010f3 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -913,6 +913,7 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[D_BACKUP_IDX] = s_user_paths[D_USER_IDX] + BACKUP_DIR DIR_SEP; s_user_paths[D_RESOURCEPACK_IDX] = s_user_paths[D_USER_IDX] + RESOURCEPACK_DIR DIR_SEP; s_user_paths[D_DYNAMICINPUT_IDX] = s_user_paths[D_LOAD_IDX] + DYNAMICINPUT_DIR DIR_SEP; + s_user_paths[D_SLIPPI_IDX] = s_user_paths[D_USER_IDX] + SLIPPI_DIR DIR_SEP; s_user_paths[F_DOLPHINCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; s_user_paths[F_GCPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + GCPAD_CONFIG; s_user_paths[F_WIIPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + WIIPAD_CONFIG; diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 5caa949aa6..d652dcb6d8 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -55,6 +55,7 @@ enum D_BACKUP_IDX, D_RESOURCEPACK_IDX, D_DYNAMICINPUT_IDX, + D_SLIPPI_IDX, F_DOLPHINCONFIG_IDX, F_GCPADCONFIG_IDX, F_WIIPADCONFIG_IDX, diff --git a/Source/Core/Core/Slippi/SlippiDirectCodes.cpp b/Source/Core/Core/Slippi/SlippiDirectCodes.cpp index 0662926a2c..6962efb3f2 100644 --- a/Source/Core/Core/Slippi/SlippiDirectCodes.cpp +++ b/Source/Core/Core/Slippi/SlippiDirectCodes.cpp @@ -47,7 +47,7 @@ void SlippiDirectCodes::ReadFile() if (!File::Exists(directCodesFilePath)) { // Attempt to create empty file with array as parent json item. - if (File::CreateEmptyFile(directCodesFilePath)) + if (File::CreateFullPath(directCodesFilePath) && File::CreateEmptyFile(directCodesFilePath)) { File::WriteStringToFile("[\n]", directCodesFilePath); } @@ -180,11 +180,8 @@ std::string SlippiDirectCodes::getCodesFilePath() #if defined(__APPLE__) std::string directCodesPath = File::GetBundleDirectory() + "/Contents/Resources" + DIR_SEP + m_fileName; -#elif defined(_WIN32) - std::string directCodesPath = File::GetExeDirectory() + DIR_SEP + m_fileName; #else - std::string directCodesPath = File::GetUserPath(D_USER_IDX) + m_fileName; -// directCodesPath.pop_back(); + std::string directCodesPath = File::GetUserPath(D_SLIPPI_IDX) + m_fileName; #endif return directCodesPath; }