mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-29 14:46:49 +00:00
core/file_sys: Read mods for the original title for updates
Updates can override RomFS and ExeFS, therefore we should apply the mods to them as well.
This commit is contained in:
parent
7c652a0479
commit
53d0c618a0
|
@ -516,7 +516,7 @@ Loader::ResultStatus NCCHContainer::ApplyCodePatch(std::vector<u8>& code) const
|
||||||
|
|
||||||
const auto mods_path =
|
const auto mods_path =
|
||||||
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
|
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
|
||||||
ncch_header.program_id);
|
ncch_header.program_id & 0x00040000'FFFFFFFF);
|
||||||
const std::array<PatchLocation, 4> patch_paths{{
|
const std::array<PatchLocation, 4> patch_paths{{
|
||||||
{mods_path + "exefs/code.ips", Patch::ApplyIpsPatch},
|
{mods_path + "exefs/code.ips", Patch::ApplyIpsPatch},
|
||||||
{mods_path + "exefs/code.bps", Patch::ApplyBpsPatch},
|
{mods_path + "exefs/code.bps", Patch::ApplyBpsPatch},
|
||||||
|
@ -560,7 +560,7 @@ Loader::ResultStatus NCCHContainer::LoadOverrideExeFSSection(const char* name,
|
||||||
|
|
||||||
const auto mods_path =
|
const auto mods_path =
|
||||||
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
|
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
|
||||||
ncch_header.program_id);
|
ncch_header.program_id & 0x00040000'FFFFFFFF);
|
||||||
std::array<std::string, 2> override_paths{{
|
std::array<std::string, 2> override_paths{{
|
||||||
mods_path + "exefs/" + override_name,
|
mods_path + "exefs/" + override_name,
|
||||||
filepath + ".exefsdir/" + override_name,
|
filepath + ".exefsdir/" + override_name,
|
||||||
|
@ -625,7 +625,7 @@ Loader::ResultStatus NCCHContainer::ReadRomFS(std::shared_ptr<RomFSReader>& romf
|
||||||
|
|
||||||
const auto path =
|
const auto path =
|
||||||
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
|
fmt::format("{}mods/{:016X}/", FileUtil::GetUserPath(FileUtil::UserPath::LoadDir),
|
||||||
ncch_header.program_id);
|
ncch_header.program_id & 0x00040000'FFFFFFFF);
|
||||||
if (FileUtil::Exists(path + "romfs/") || FileUtil::Exists(path + "romfs_ext/")) {
|
if (FileUtil::Exists(path + "romfs/") || FileUtil::Exists(path + "romfs_ext/")) {
|
||||||
romfs_file = std::make_shared<LayeredFS>(std::move(direct_romfs), path + "romfs/",
|
romfs_file = std::make_shared<LayeredFS>(std::move(direct_romfs), path + "romfs/",
|
||||||
path + "romfs_ext/");
|
path + "romfs_ext/");
|
||||||
|
|
Loading…
Reference in a new issue