diff options
author | Lioncash <mathew1800@gmail.com> | 2020-09-15 09:13:22 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-09-15 09:20:40 +0200 |
commit | ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb (patch) | |
tree | 40c3f27fd271cfd95314a7c56ffa25a38eb79a6f /src/core/file_sys/patch_manager.cpp | |
parent | Merge pull request #4655 from lioncash/internal2 (diff) | |
download | yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.tar yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.tar.gz yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.tar.bz2 yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.tar.lz yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.tar.xz yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.tar.zst yuzu-ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/patch_manager.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 87c354a43..b9c09b456 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -76,8 +76,7 @@ VirtualDir FindSubdirectoryCaseless(const VirtualDir dir, std::string_view name) } std::optional<std::vector<Core::Memory::CheatEntry>> ReadCheatFileFromFolder( - const Core::System& system, u64 title_id, const PatchManager::BuildID& build_id_, - const VirtualDir& base_path, bool upper) { + u64 title_id, const PatchManager::BuildID& build_id_, const VirtualDir& base_path, bool upper) { const auto build_id_raw = Common::HexToString(build_id_, upper); const auto build_id = build_id_raw.substr(0, sizeof(u64) * 2); const auto file = base_path->GetFile(fmt::format("{}.txt", build_id)); @@ -95,9 +94,8 @@ std::optional<std::vector<Core::Memory::CheatEntry>> ReadCheatFileFromFolder( return std::nullopt; } - Core::Memory::TextCheatParser parser; - return parser.Parse(system, - std::string_view(reinterpret_cast<const char*>(data.data()), data.size())); + const Core::Memory::TextCheatParser parser; + return parser.Parse(std::string_view(reinterpret_cast<const char*>(data.data()), data.size())); } void AppendCommaIfNotEmpty(std::string& to, std::string_view with) { @@ -335,14 +333,12 @@ std::vector<Core::Memory::CheatEntry> PatchManager::CreateCheatList( auto cheats_dir = FindSubdirectoryCaseless(subdir, "cheats"); if (cheats_dir != nullptr) { - auto res = ReadCheatFileFromFolder(system, title_id, build_id_, cheats_dir, true); - if (res.has_value()) { + if (const auto res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, true)) { std::copy(res->begin(), res->end(), std::back_inserter(out)); continue; } - res = ReadCheatFileFromFolder(system, title_id, build_id_, cheats_dir, false); - if (res.has_value()) { + if (const auto res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, false)) { std::copy(res->begin(), res->end(), std::back_inserter(out)); } } |