diff options
author | Subv <subv2112@gmail.com> | 2015-01-01 03:43:31 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2015-01-03 03:55:13 +0100 |
commit | 3bc9f5509b9f36e934d1a16eeda31be9bb22ac10 (patch) | |
tree | b76cac429cdde11056ecb96f0a55abf92ce8edbb /src/core | |
parent | Merge pull request #381 from Subv/savedatacheck (diff) | |
download | yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.tar yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.tar.gz yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.tar.bz2 yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.tar.lz yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.tar.xz yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.tar.zst yuzu-3bc9f5509b9f36e934d1a16eeda31be9bb22ac10.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/file_sys/archive_extsavedata.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/service/fs/archive.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/ptm_u.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 4759ef3ae..2f00bf067 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -19,10 +19,9 @@ namespace FileSys { static std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) { std::vector<u8> vec_data = path.AsBinary(); const u32* data = reinterpret_cast<const u32*>(vec_data.data()); - u32 media_type = data[0]; u32 save_low = data[1]; u32 save_high = data[2]; - return Common::StringFromFormat("%s%s/%08X/%08X/", mount_point.c_str(), media_type == 0 ? "nand" : "sdmc", save_high, save_low); + return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_high, save_low); } Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_point) diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index f761c6ab9..56d53402f 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -455,7 +455,7 @@ void ArchiveInit() { else LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path %s", extsavedata_directory.c_str()); - std::string sharedextsavedata_directory = FileUtil::GetUserPath(D_EXTSAVEDATA); + std::string sharedextsavedata_directory = FileUtil::GetUserPath(D_SHAREDEXTSAVEDATA); auto sharedextsavedata_archive = Common::make_unique<FileSys::Archive_ExtSaveData>(sharedextsavedata_directory); if (sharedextsavedata_archive->Initialize()) CreateArchive(std::move(sharedextsavedata_archive), ArchiveIdCode::SharedExtSaveData); diff --git a/src/core/hle/service/ptm_u.cpp b/src/core/hle/service/ptm_u.cpp index 9cc700c46..c900c90f8 100644 --- a/src/core/hle/service/ptm_u.cpp +++ b/src/core/hle/service/ptm_u.cpp @@ -142,7 +142,7 @@ Interface::Interface() { Register(FunctionTable, ARRAY_SIZE(FunctionTable)); // Create the SharedExtSaveData archive 0xF000000B and the gamecoin.dat file // TODO(Subv): In the future we should use the FS service to query this archive - std::string extsavedata_directory = FileUtil::GetUserPath(D_EXTSAVEDATA); + std::string extsavedata_directory = FileUtil::GetUserPath(D_SHAREDEXTSAVEDATA); ptm_shared_extsavedata = Common::make_unique<FileSys::Archive_ExtSaveData>(extsavedata_directory); if (!ptm_shared_extsavedata->Initialize()) { LOG_CRITICAL(Service_PTM, "Could not initialize ExtSaveData archive for the PTM:U service"); |