N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core/file_sys: Allow exheader replacement to be read from mods path

Browse source 
The previous method (filename.exheader) can still be used.
This commit is contained in:
zhupengfei 2020-02-07 15:55:35 +08:00
parent 53d0c618a0
commit eed9de2336
No known key found for this signature in database
GPG key ID: DD129E108BD09378
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/file_sys/ncch_container.cpp
View file

@ -304,8 +304,22 @@ Loader::ResultStatus NCCHContainer::Load() {
} }
} }
FileUtil::IOFile exheader_override_file{filepath + ".exheader", "rb"}; const auto mods_path =
const bool has_exheader_override = read_exheader(exheader_override_file); fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
ncch_header.program_id & 0x00040000'FFFFFFFF);
std::array<std::string, 2> exheader_override_paths{{
mods_path + "exheader.bin",
filepath + ".exheader",
}};
bool has_exheader_override = false;
for (const auto& path : exheader_override_paths) {
FileUtil::IOFile exheader_override_file{path, "rb"};
if (read_exheader(exheader_override_file)) {
has_exheader_override = true;
break;
}
}
if (has_exheader_override) { if (has_exheader_override) {
if (exheader_header.system_info.jump_id != if (exheader_header.system_info.jump_id !=
exheader_header.arm11_system_local_caps.program_id) { exheader_header.arm11_system_local_caps.program_id) {