piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2018 from JosJuice/gameini-region-wildcard

Browse Source 
Support game INIs that match all regions
This commit is contained in:
Markus Wick
2015-02-21 15:47:57 +01:00
parent 6bbf774507 b85a4ced9f
commit 95c48b2be7
1342 changed files with 3609 additions and 24289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -121,13 +121,9 @@ GameListItem::GameListItem(const std::string& _rFileName)
if (IsValid())
{
IniFile ini;
ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini");
ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true);
IniFile::Section* emu_state = ini.GetOrCreateSection("EmuState");
emu_state->Get("EmulationStateId", &m_emu_state);
emu_state->Get("EmulationIssues", &m_issues);
IniFile ini = SCoreStartupParameter::LoadGameIni(m_UniqueID, m_Revision);
ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state);
ini.GetIfExists("EmuState", "EmulationIssues", &m_issues);
}
if (!m_pImage.empty())