ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GameDB: Address string related compiler errors on linux

This commit is contained in:
kenshen112 2020-11-15 09:32:42 -07:00 committed by refractionpcsx2
parent 39a4d3ce4e
commit 5ef141187a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/GameDatabase.cpp
View File

@ -26,7 +26,7 @@ std::string GameDatabaseSchema::GameEntry::memcardFiltersAsString()
return ""; return "";
std::string filters; std::string filters;
for (int i = 0; i < memcardFilters.size(); i++) for (u32 i = 0; i < memcardFilters.size(); i++)
{ {
std::string f = memcardFilters.at(i); std::string f = memcardFilters.at(i);
filters.append(f); filters.append(f);
@ -93,7 +93,7 @@ GameDatabaseSchema::GameEntry YamlGameDatabaseImpl::entryFromYaml(const std::str
bool fixValidated = false; bool fixValidated = false;
for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id) for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id)
{ {
std::string validFix = wxString(EnumToString(id)).ToStdString() + L"Hack"; std::string validFix = wxString(EnumToString(id)).Append(L"Hack").ToStdString();
if (validFix == fix) if (validFix == fix)
{ {
fixValidated = true; fixValidated = true;

4
pcsx2/gui/AppCoreThread.cpp
View File

@ -311,8 +311,8 @@ static int loadGameSettings(Pcsx2Config& dest, const GameDatabaseSchema::GameEnt
// TODO - config - this could be simplified with maps instead of bitfields and enums // TODO - config - this could be simplified with maps instead of bitfields and enums
for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id) for (GamefixId id = GamefixId_FIRST; id < pxEnumEnd; ++id)
{ {
std::string key = wxString(EnumToString(id)) + L"Hack"; std::string key = wxString(EnumToString(id)).Append(L"Hack").ToStdString();
// Gamefixes are already guaranteed to be valid, any invalid ones are dropped // Gamefixes are already guaranteed to be valid, any invalid ones are dropped
if (std::find(game.gameFixes.begin(), game.gameFixes.end(), key) != game.gameFixes.end()) if (std::find(game.gameFixes.begin(), game.gameFixes.end(), key) != game.gameFixes.end())
{ {