From ba7eb5abf4cd50b4dd1dc894bc633b678d38a1cb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 15 Sep 2020 03:13:22 -0400 Subject: cheat_engine: Remove unnecessary system argument to CheatParser's Parse function This isn't used within the function at all in any implementations, so we can remove it entirely. --- src/core/file_sys/patch_manager.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/core/file_sys/patch_manager.cpp') 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> 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> ReadCheatFileFromFolder( return std::nullopt; } - Core::Memory::TextCheatParser parser; - return parser.Parse(system, - std::string_view(reinterpret_cast(data.data()), data.size())); + const Core::Memory::TextCheatParser parser; + return parser.Parse(std::string_view(reinterpret_cast(data.data()), data.size())); } void AppendCommaIfNotEmpty(std::string& to, std::string_view with) { @@ -335,14 +333,12 @@ std::vector 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)); } } -- cgit v1.2.3