ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cheats: Fix parsing of Retroarch cheats

This commit is contained in:
Connor McLaughlin 2020-09-25 22:00:34 +10:00
parent 40037d6e90
commit e7cfc69975
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/cheats.cpp
View File

@ -149,7 +149,7 @@ bool CheatList::LoadFromLibretroFile(const char* filename)
while (*value_start != '\0' && std::isspace(*value_start)) while (*value_start != '\0' && std::isspace(*value_start))
value_start++; value_start++;
if (value_start == end) if (*value_start == '\0')
continue; continue;
char* value_end = value_start + std::strlen(value_start) - 1; char* value_end = value_start + std::strlen(value_start) - 1;
@ -159,9 +159,6 @@ bool CheatList::LoadFromLibretroFile(const char* filename)
value_end--; value_end--;
} }
if (value_start == value_end)
continue;
if (*value_start == '\"') if (*value_start == '\"')
{ {
if (*value_end != '\"') if (*value_end != '\"')
@ -178,7 +175,7 @@ bool CheatList::LoadFromLibretroFile(const char* filename)
return false; return false;
const std::string* num_cheats_value = FindKey(kvp, "cheats"); const std::string* num_cheats_value = FindKey(kvp, "cheats");
const u32 num_cheats = StringUtil::FromChars<u32>(*num_cheats_value).value_or(0); const u32 num_cheats = num_cheats_value ? StringUtil::FromChars<u32>(*num_cheats_value).value_or(0) : 0;
if (num_cheats == 0) if (num_cheats == 0)
return false; return false;
@ -204,6 +201,11 @@ bool CheatList::LoadFromLibretroFile(const char* filename)
return !m_codes.empty(); return !m_codes.empty();
} }
static bool IsLibretroSeparator(char ch)
{
return (ch == ' ' || ch == '-' || ch == ':' || ch == '+');
}
bool CheatList::ParseLibretroCheat(CheatCode* cc, const char* line) bool CheatList::ParseLibretroCheat(CheatCode* cc, const char* line)
{ {
const char* current_ptr = line; const char* current_ptr = line;
@ -215,7 +217,7 @@ bool CheatList::ParseLibretroCheat(CheatCode* cc, const char* line)
current_ptr = end_ptr; current_ptr = end_ptr;
if (end_ptr) if (end_ptr)
{ {
if (*end_ptr != ' ') if (!IsLibretroSeparator(*end_ptr))
{ {
Log_WarningPrintf("Malformed code '%s'", line); Log_WarningPrintf("Malformed code '%s'", line);
break; break;
@ -226,9 +228,9 @@ bool CheatList::ParseLibretroCheat(CheatCode* cc, const char* line)
if (end_ptr && *end_ptr == '\0') if (end_ptr && *end_ptr == '\0')
end_ptr = nullptr; end_ptr = nullptr;
if (end_ptr) if (end_ptr && *end_ptr != '\0')
{ {
if (*end_ptr != '+') if (!IsLibretroSeparator(*end_ptr))
{ {
Log_WarningPrintf("Malformed code '%s'", line); Log_WarningPrintf("Malformed code '%s'", line);
break; break;
@ -285,7 +287,6 @@ std::optional<CheatList::Format> CheatList::DetectFileFormat(const char* filenam
return Format::Count; return Format::Count;
char line[1024]; char line[1024];
KeyValuePairVector kvp;
while (std::fgets(line, sizeof(line), fp.get())) while (std::fgets(line, sizeof(line), fp.get()))
{ {
char* start = line; char* start = line;

2
src/frontend-common/common_host_interface.cpp
View File

@ -2203,7 +2203,7 @@ bool CommonHostInterface::LoadCheatList(const char* filename)
return false; return false;
std::unique_ptr<CheatList> cl = std::make_unique<CheatList>(); std::unique_ptr<CheatList> cl = std::make_unique<CheatList>();
if (!cl->LoadFromPCSXRFile(filename)) if (!cl->LoadFromFile(filename, CheatList::Format::Autodetect))
{ {
AddFormattedOSDMessage(15.0f, TranslateString("OSDMessage", "Failed to load cheats from '%s'."), filename); AddFormattedOSDMessage(15.0f, TranslateString("OSDMessage", "Failed to load cheats from '%s'."), filename);
return false; return false;