diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-22 11:08:11 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-22 19:43:37 +0100 |
commit | 540235bb05ecd18b958f9ef2a667d94fedca61af (patch) | |
tree | 28e3b04177a193d3e476c0610c29c5862ea63350 /src/core/file_sys/patch_manager.cpp | |
parent | Merge pull request #2234 from lioncash/mutex (diff) | |
download | yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.tar yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.tar.gz yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.tar.bz2 yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.tar.lz yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.tar.xz yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.tar.zst yuzu-540235bb05ecd18b958f9ef2a667d94fedca61af.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/patch_manager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 2b09e5d35..58884b4a0 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -233,7 +233,7 @@ bool PatchManager::HasNSOPatch(const std::array<u8, 32>& build_id_) const { return !CollectPatches(patch_dirs, build_id).empty(); } -static std::optional<CheatList> ReadCheatFileFromFolder(u64 title_id, +static std::optional<CheatList> ReadCheatFileFromFolder(const Core::System& system, u64 title_id, const std::array<u8, 0x20>& build_id_, const VirtualDir& base_path, bool upper) { const auto build_id_raw = Common::HexArrayToString(build_id_, upper); @@ -254,28 +254,28 @@ static std::optional<CheatList> ReadCheatFileFromFolder(u64 title_id, } TextCheatParser parser; - return parser.Parse(data); + return parser.Parse(system, data); } -std::vector<CheatList> PatchManager::CreateCheatList(const std::array<u8, 32>& build_id_) const { - std::vector<CheatList> out; - +std::vector<CheatList> PatchManager::CreateCheatList(const Core::System& system, + const std::array<u8, 32>& build_id_) const { const auto load_dir = Service::FileSystem::GetModificationLoadRoot(title_id); auto patch_dirs = load_dir->GetSubdirectories(); std::sort(patch_dirs.begin(), patch_dirs.end(), [](const VirtualDir& l, const VirtualDir& r) { return l->GetName() < r->GetName(); }); + std::vector<CheatList> out; out.reserve(patch_dirs.size()); for (const auto& subdir : patch_dirs) { auto cheats_dir = subdir->GetSubdirectory("cheats"); if (cheats_dir != nullptr) { - auto res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, true); + auto res = ReadCheatFileFromFolder(system, title_id, build_id_, cheats_dir, true); if (res.has_value()) { out.push_back(std::move(*res)); continue; } - res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, false); + res = ReadCheatFileFromFolder(system, title_id, build_id_, cheats_dir, false); if (res.has_value()) out.push_back(std::move(*res)); } |