lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

cheat_engine: Remove unnecessary system argument to CheatParser's Parse function

Browse source 
This isn't used within the function at all in any implementations, so we
can remove it entirely.
This commit is contained in:
Lioncash 2020-09-15 03:13:22 -04:00
parent b5f4221c3d
commit ba7eb5abf4
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/file_sys/patch_manager.cpp
View file

@ -76,8 +76,7 @@ VirtualDir FindSubdirectoryCaseless(const VirtualDir dir, std::string_view name)
} }
std::optional<std::vector<Core::Memory::CheatEntry>> ReadCheatFileFromFolder( std::optional<std::vector<Core::Memory::CheatEntry>> ReadCheatFileFromFolder(
const Core::System& system, u64 title_id, const PatchManager::BuildID& build_id_, u64 title_id, const PatchManager::BuildID& build_id_, const VirtualDir& base_path, bool upper) {
const VirtualDir& base_path, bool upper) {
const auto build_id_raw = Common::HexToString(build_id_, 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 build_id = build_id_raw.substr(0, sizeof(u64) * 2);
const auto file = base_path->GetFile(fmt::format("{}.txt", build_id)); 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; return std::nullopt;
} }
Core::Memory::TextCheatParser parser; const Core::Memory::TextCheatParser parser;
return parser.Parse(system, return parser.Parse(std::string_view(reinterpret_cast<const char*>(data.data()), data.size()));
std::string_view(reinterpret_cast<const char*>(data.data()), data.size()));
} }
void AppendCommaIfNotEmpty(std::string& to, std::string_view with) { 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"); auto cheats_dir = FindSubdirectoryCaseless(subdir, "cheats");
if (cheats_dir != nullptr) { if (cheats_dir != nullptr) {
auto res = ReadCheatFileFromFolder(system, title_id, build_id_, cheats_dir, true); if (const auto res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, true)) {
if (res.has_value()) {
std::copy(res->begin(), res->end(), std::back_inserter(out)); std::copy(res->begin(), res->end(), std::back_inserter(out));
continue; continue;
} }
res = ReadCheatFileFromFolder(system, title_id, build_id_, cheats_dir, false); if (const auto res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, false)) {
if (res.has_value()) {
std::copy(res->begin(), res->end(), std::back_inserter(out)); std::copy(res->begin(), res->end(), std::back_inserter(out));
} }
} }

5
src/core/memory/cheat_engine.cpp
View file

@ -98,10 +98,9 @@ std::string_view ExtractName(std::string_view data, std::size_t start_index) {
} }
} // Anonymous namespace } // Anonymous namespace
std::vector<CheatEntry> TextCheatParser::Parse(const Core::System& system, std::vector<CheatEntry> TextCheatParser::Parse(std::string_view data) const {
std::string_view data) const {
std::vector<CheatEntry> out(1); std::vector<CheatEntry> out(1);
std::optional<u64> current_entry = std::nullopt; std::optional<u64> current_entry;
for (std::size_t i = 0; i < data.size(); ++i) { for (std::size_t i = 0; i < data.size(); ++i) {
if (::isspace(data[i])) { if (::isspace(data[i])) {

5
src/core/memory/cheat_engine.h
View file

@ -47,8 +47,7 @@ class CheatParser {
public: public:
virtual ~CheatParser(); virtual ~CheatParser();
virtual std::vector<CheatEntry> Parse(const Core::System& system, [[nodiscard]] virtual std::vector<CheatEntry> Parse(std::string_view data) const = 0;
std::string_view data) const = 0;
}; };
// CheatParser implementation that parses text files // CheatParser implementation that parses text files
@ -56,7 +55,7 @@ class TextCheatParser final : public CheatParser {
public: public:
~TextCheatParser() override; ~TextCheatParser() override;
std::vector<CheatEntry> Parse(const Core::System& system, std::string_view data) const override; [[nodiscard]] std::vector<CheatEntry> Parse(std::string_view data) const override;
}; };
// Class that encapsulates a CheatList and manages its interaction with memory and CoreTiming // Class that encapsulates a CheatList and manages its interaction with memory and CoreTiming