github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cheats: Allow hex literal in option ranges

Browse Source
This commit is contained in:
Stenzek 2024-10-27 12:32:20 +10:00
parent 218df625df
commit 1d21ca61e7
No known key found for this signature in database
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/cheats.cpp
View File

@ -1371,8 +1371,10 @@ bool Cheats::ParseOptionRange(const std::string_view value, u16* out_range_start
// OptionRange = 0:255 // OptionRange = 0:255
if (const std::string_view::size_type pos = value.rfind(':'); pos != std::string_view::npos) if (const std::string_view::size_type pos = value.rfind(':'); pos != std::string_view::npos)
{ {
const std::optional<u32> start = StringUtil::FromChars<u32>(StringUtil::StripWhitespace(value.substr(0, pos))); const std::optional<u32> start =
const std::optional<u32> end = StringUtil::FromChars<u32>(StringUtil::StripWhitespace(value.substr(pos + 1))); StringUtil::FromCharsWithOptionalBase<u32>(StringUtil::StripWhitespace(value.substr(0, pos)));
const std::optional<u32> end =
StringUtil::FromCharsWithOptionalBase<u32>(StringUtil::StripWhitespace(value.substr(pos + 1)));
if (start.has_value() && end.has_value() && start.value() <= std::numeric_limits<u16>::max() && if (start.has_value() && end.has_value() && start.value() <= std::numeric_limits<u16>::max() &&
end.value() <= std::numeric_limits<u16>::max() && end.value() > start.value()) end.value() <= std::numeric_limits<u16>::max() && end.value() > start.value())
{ {
@ -1961,7 +1963,7 @@ std::unique_ptr<Cheats::GamesharkCheatCode> Cheats::GamesharkCheatCode::Parse(Me
} }
size_t next_offset = 0; size_t next_offset = 0;
while (next_offset < next.size() && !StringUtil::IsHexDigit(next[next_offset])) while (next_offset < next.size() && next[next_offset] != '?' && !StringUtil::IsHexDigit(next[next_offset]))
next_offset++; next_offset++;
next = (next_offset < next.size()) ? next.substr(next_offset) : std::string_view(); next = (next_offset < next.size()) ? next.substr(next_offset) : std::string_view();