diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-12-23 16:04:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 16:04:05 +0100 |
| commit | fc998093cce1e2876e776bdede807887cb979a17 (patch) | |
| tree | ee67b7c51efa69cf471230fb592d8508ff079f22 /Source/Core/Common | |
| parent | 2d0031551e6f163eae256ffb9d2fc81742255be1 (diff) | |
| parent | 71d53c922fe09e5598cb31990d003f92f8e2b0a9 (diff) | |
Merge pull request #7600 from spycrab/resource_pack
Implement resource packs
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/CommonPaths.h | 1 | ||||
| -rw-r--r-- | Source/Core/Common/FileUtil.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Common/FileUtil.h | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 7daeebe630..fe241c5f61 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -66,6 +66,7 @@ #define MEMORYWATCHER_DIR "MemoryWatcher" #define WFSROOT_DIR "WFS" #define BACKUP_DIR "Backup" +#define RESOURCEPACK_DIR "ResourcePacks" // 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 2784d1ebda..fe622ac21a 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -780,6 +780,7 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[D_PIPES_IDX] = s_user_paths[D_USER_IDX] + PIPES_DIR DIR_SEP; s_user_paths[D_WFSROOT_IDX] = s_user_paths[D_USER_IDX] + WFSROOT_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[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 8f4c3633eb..6adea032cd 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -51,6 +51,7 @@ enum D_MEMORYWATCHER_IDX, D_WFSROOT_IDX, D_BACKUP_IDX, + D_RESOURCEPACK_IDX, F_DOLPHINCONFIG_IDX, F_GCPADCONFIG_IDX, F_WIIPADCONFIG_IDX, @@ -210,4 +211,4 @@ void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmod #endif } -} // namespace +} // namespace File |
