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

Use CoreParameter's game INI functions in more places

Browse Source
This commit is contained in:
JosJuice
2015-02-07 21:27:26 +01:00
parent e186104960
commit f9d6c17c08
7 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -163,11 +163,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
}
}
// Load game ini
// Is it really necessary to use GetTitleID in case GetUniqueID fails?
std::string _iniFilename = OpenISO->GetUniqueID();
std::string _iniFilenameRevisionSpecific = _iniFilename + "r" + std::to_string(OpenISO->GetRevision());
if (!_iniFilename.length())
if (_iniFilename.empty())
{
u8 title_id[8];
if (OpenISO->GetTitleID(title_id))
@ -176,13 +174,11 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
}
}
// Load game INIs
GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini";
std::string GameIniFileDefaultRevisionSpecific = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilenameRevisionSpecific + ".ini";
GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini";
GameIniDefault.Load(GameIniFileDefault);
GameIniDefault.Load(GameIniFileDefaultRevisionSpecific, true);
GameIniLocal.Load(GameIniFileLocal);
GameIniDefault = SCoreStartupParameter::LoadDefaultGameIni(_iniFilename, OpenISO->GetRevision());
GameIniLocal = SCoreStartupParameter::LoadLocalGameIni(_iniFilename, OpenISO->GetRevision());
// Setup GUI
OpenGameListItem = new GameListItem(fileName);