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

Don't use revision-specific unique ID strings outside of CoreParameter

This commit is contained in:
JosJuice 2015-02-07 09:49:26 +01:00
parent 47e67f9696
commit e186104960
6 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/CoreParameter.cpp
View File

@ -180,7 +180,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
}
m_strName = pVolume->GetName();
m_strUniqueID = pVolume->GetUniqueID();
m_strRevisionSpecificUniqueID = pVolume->GetRevisionSpecificUniqueID();
m_revision = pVolume->GetRevision();
// Check if we have a Wii disc
bWii = pVolume.get()->IsWiiDisc();
@ -407,6 +407,5 @@ void SCoreStartupParameter::LoadGameIni(IniFile* game_ini, const std::string& pa
game_ini->Load(path + GetUniqueID() + ".ini", true);
// INIs with specific revisions
if (!m_strRevisionSpecificUniqueID.empty())
game_ini->Load(path + m_strRevisionSpecificUniqueID + ".ini", true);
game_ini->Load(path + GetUniqueID() + StringFromFormat("r%d", m_revision) + ".ini", true);
}

2
Source/Core/Core/CoreParameter.h
View File

@ -247,8 +247,8 @@ struct SCoreStartupParameter
std::string m_strDVDRoot;
std::string m_strApploader;
std::string m_strUniqueID;
std::string m_strRevisionSpecificUniqueID;
std::string m_strName;
int m_revision;
std::string m_perfDir;

1
Source/Core/DiscIO/Volume.h
View File

@ -28,7 +28,6 @@ public:
return std::unique_ptr<u8[]>();
}
virtual std::string GetUniqueID() const = 0;
virtual std::string GetRevisionSpecificUniqueID() const { return ""; }
virtual std::string GetMakerID() const = 0;
virtual int GetRevision() const { return 0; }
// TODO: eliminate?

5
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -56,11 +56,6 @@ std::string CVolumeGC::GetUniqueID() const
return ID;
}
std::string CVolumeGC::GetRevisionSpecificUniqueID() const
{
return GetUniqueID() + StringFromFormat("r%d", GetRevision());
}
IVolume::ECountry CVolumeGC::GetCountry() const
{
if (!m_pReader)

1
Source/Core/DiscIO/VolumeGC.h
View File

@ -25,7 +25,6 @@ public:
~CVolumeGC();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
std::string GetUniqueID() const override;
std::string GetRevisionSpecificUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
std::vector<std::string> GetNames() const override;

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

@ -165,7 +165,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
// Load game ini
std::string _iniFilename = OpenISO->GetUniqueID();
std::string _iniFilenameRevisionSpecific = OpenISO->GetRevisionSpecificUniqueID();
std::string _iniFilenameRevisionSpecific = _iniFilename + "r" + std::to_string(OpenISO->GetRevision());
if (!_iniFilename.length())
{
@ -181,7 +181,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini";
GameIniDefault.Load(GameIniFileDefault);
if (_iniFilenameRevisionSpecific != "")
GameIniDefault.Load(GameIniFileDefaultRevisionSpecific, true);
GameIniLocal.Load(GameIniFileLocal);