mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull in project-slippi/Ishiiruka/commit/40cb08774ec8f2f2b1e78df09a0a8dc9c793afa8

Browse source
This commit is contained in:
Nikhil Narayana 2022-05-08 22:46:53 -07:00
commit c5ac13fc30
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Common/CommonPaths.h
View file

@ -71,6 +71,7 @@
#define BACKUP_DIR "Backup" #define BACKUP_DIR "Backup"
#define RESOURCEPACK_DIR "ResourcePacks" #define RESOURCEPACK_DIR "ResourcePacks"
#define DYNAMICINPUT_DIR "DynamicInputTextures" #define DYNAMICINPUT_DIR "DynamicInputTextures"
#define SLIPPI_DIR "Slippi"
// This one is only used to remove it if it was present // This one is only used to remove it if it was present
#define SHADERCACHE_LEGACY_DIR "ShaderCache" #define SHADERCACHE_LEGACY_DIR "ShaderCache"

1
Source/Core/Common/FileUtil.cpp
View file

@ -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_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_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_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_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_GCPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + GCPAD_CONFIG;
s_user_paths[F_WIIPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + WIIPAD_CONFIG; s_user_paths[F_WIIPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + WIIPAD_CONFIG;

1
Source/Core/Common/FileUtil.h
View file

@ -55,6 +55,7 @@ enum
D_BACKUP_IDX, D_BACKUP_IDX,
D_RESOURCEPACK_IDX, D_RESOURCEPACK_IDX,
D_DYNAMICINPUT_IDX, D_DYNAMICINPUT_IDX,
D_SLIPPI_IDX,
F_DOLPHINCONFIG_IDX, F_DOLPHINCONFIG_IDX,
F_GCPADCONFIG_IDX, F_GCPADCONFIG_IDX,
F_WIIPADCONFIG_IDX, F_WIIPADCONFIG_IDX,

7
Source/Core/Core/Slippi/SlippiDirectCodes.cpp
View file

@ -47,7 +47,7 @@ void SlippiDirectCodes::ReadFile()
if (!File::Exists(directCodesFilePath)) if (!File::Exists(directCodesFilePath))
{ {
// Attempt to create empty file with array as parent json item. // 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); File::WriteStringToFile("[\n]", directCodesFilePath);
} }
@ -180,11 +180,8 @@ std::string SlippiDirectCodes::getCodesFilePath()
#if defined(__APPLE__) #if defined(__APPLE__)
std::string directCodesPath = std::string directCodesPath =
File::GetBundleDirectory() + "/Contents/Resources" + DIR_SEP + m_fileName; File::GetBundleDirectory() + "/Contents/Resources" + DIR_SEP + m_fileName;
#elif defined(_WIN32)
std::string directCodesPath = File::GetExeDirectory() + DIR_SEP + m_fileName;
#else #else
std::string directCodesPath = File::GetUserPath(D_USER_IDX) + m_fileName; std::string directCodesPath = File::GetUserPath(D_SLIPPI_IDX) + m_fileName;
// directCodesPath.pop_back();
#endif #endif
return directCodesPath; return directCodesPath;
} }