diff options
author | bunnei <bunneidev@gmail.com> | 2016-12-16 06:37:38 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2016-12-22 05:48:13 +0100 |
commit | 4fc8b8229ed1d9ea9d20faee7059c898265db6cf (patch) | |
tree | 45095e416393473fe9721c60edd9a220b2e44dd4 /src/core/file_sys | |
parent | core: Consolidate core and system state, remove system module & cleanups. (diff) | |
download | yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.gz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.bz2 yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.lz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.xz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.zst yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.zip |
Diffstat (limited to 'src/core/file_sys')
-rw-r--r-- | src/core/file_sys/archive_extsavedata.cpp | 4 | ||||
-rw-r--r-- | src/core/file_sys/archive_ncch.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/archive_source_sd_savedata.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/archive_systemsavedata.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 5b172df4a..b9fc77e34 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -142,10 +142,10 @@ std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) { if (shared) return Common::StringFromFormat("%sdata/%s/extdata/", mount_point.c_str(), - SYSTEM_ID.c_str()); + SYSTEM_ID); return Common::StringFromFormat("%sNintendo 3DS/%s/%s/extdata/", mount_point.c_str(), - SYSTEM_ID.c_str(), SDCARD_ID.c_str()); + SYSTEM_ID, SDCARD_ID); } Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low) { diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp index 6f1aadfc3..89455e39c 100644 --- a/src/core/file_sys/archive_ncch.cpp +++ b/src/core/file_sys/archive_ncch.cpp @@ -19,7 +19,7 @@ namespace FileSys { static std::string GetNCCHContainerPath(const std::string& nand_directory) { - return Common::StringFromFormat("%s%s/title/", nand_directory.c_str(), SYSTEM_ID.c_str()); + return Common::StringFromFormat("%s%s/title/", nand_directory.c_str(), SYSTEM_ID); } static std::string GetNCCHPath(const std::string& mount_point, u32 high, u32 low) { diff --git a/src/core/file_sys/archive_source_sd_savedata.cpp b/src/core/file_sys/archive_source_sd_savedata.cpp index 287322d3e..e01357891 100644 --- a/src/core/file_sys/archive_source_sd_savedata.cpp +++ b/src/core/file_sys/archive_source_sd_savedata.cpp @@ -18,7 +18,7 @@ namespace { std::string GetSaveDataContainerPath(const std::string& sdmc_directory) { return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", sdmc_directory.c_str(), - SYSTEM_ID.c_str(), SDCARD_ID.c_str()); + SYSTEM_ID, SDCARD_ID); } std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) { diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 54e7793e0..8986b5c0e 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp @@ -26,7 +26,7 @@ std::string GetSystemSaveDataPath(const std::string& mount_point, const Path& pa } std::string GetSystemSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sdata/%s/sysdata/", mount_point.c_str(), SYSTEM_ID.c_str()); + return Common::StringFromFormat("%sdata/%s/sysdata/", mount_point.c_str(), SYSTEM_ID); } Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low) { |