midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_sys: Attempt to open New 3DS variant NCCH if available. (#6383)

Browse Source
This commit is contained in:
Steveice10 2023-04-01 20:27:56 -07:00 committed by GitHub
parent a74d7a0e6b
commit 041252ba36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/file_sys/archive_ncch.cpp
View File

@ -12,6 +12,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/settings.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "common/swap.h" #include "common/swap.h"
#include "core/core.h" #include "core/core.h"
@ -88,8 +89,17 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
NCCHFilePath openfile_path; NCCHFilePath openfile_path;
std::memcpy(&openfile_path, binary.data(), sizeof(NCCHFilePath)); std::memcpy(&openfile_path, binary.data(), sizeof(NCCHFilePath));
std::string file_path = std::string file_path;
if (Settings::values.is_new_3ds) {
// Try the New 3DS specific variant first.
file_path = Service::AM::GetTitleContentPath(media_type, title_id | 0x20000000,
openfile_path.content_index);
}
if (!Settings::values.is_new_3ds || !FileUtil::Exists(file_path)) {
file_path =
Service::AM::GetTitleContentPath(media_type, title_id, openfile_path.content_index); Service::AM::GetTitleContentPath(media_type, title_id, openfile_path.content_index);
}
auto ncch_container = NCCHContainer(file_path, 0, openfile_path.content_index); auto ncch_container = NCCHContainer(file_path, 0, openfile_path.content_index);
Loader::ResultStatus result; Loader::ResultStatus result;