summaryrefslogtreecommitdiffstats
path: root/src/core/file_sys/patch_manager.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-08 18:31:27 +0200
committerGitHub <noreply@github.com>2018-10-08 18:31:27 +0200
commit561d79e03443aec02f54e1e43437bc1d5b90ca88 (patch)
tree7e2e14de7eb8dea04c415e70a3b638d76084c86b /src/core/file_sys/patch_manager.cpp
parentMerge pull request #1424 from DarkLordZach/ips-witch (diff)
parentpatch_manager: Avoid romfs_ext requirement for patching (diff)
downloadyuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.tar
yuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.tar.gz
yuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.tar.bz2
yuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.tar.lz
yuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.tar.xz
yuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.tar.zst
yuzu-561d79e03443aec02f54e1e43437bc1d5b90ca88.zip
Diffstat (limited to 'src/core/file_sys/patch_manager.cpp')
-rw-r--r--src/core/file_sys/patch_manager.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index 7b31a57a4..b14d7cb0a 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -182,11 +182,17 @@ static void ApplyLayeredFS(VirtualFile& romfs, u64 title_id, ContentRecordType t
[](const VirtualDir& l, const VirtualDir& r) { return l->GetName() < r->GetName(); });
std::vector<VirtualDir> layers;
+ std::vector<VirtualDir> layers_ext;
layers.reserve(patch_dirs.size() + 1);
+ layers_ext.reserve(patch_dirs.size() + 1);
for (const auto& subdir : patch_dirs) {
auto romfs_dir = subdir->GetSubdirectory("romfs");
if (romfs_dir != nullptr)
layers.push_back(std::move(romfs_dir));
+
+ auto ext_dir = subdir->GetSubdirectory("romfs_ext");
+ if (ext_dir != nullptr)
+ layers_ext.push_back(std::move(ext_dir));
}
layers.push_back(std::move(extracted));
@@ -195,7 +201,9 @@ static void ApplyLayeredFS(VirtualFile& romfs, u64 title_id, ContentRecordType t
return;
}
- auto packed = CreateRomFS(std::move(layered));
+ auto layered_ext = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers_ext));
+
+ auto packed = CreateRomFS(std::move(layered), std::move(layered_ext));
if (packed == nullptr) {
return;
}