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

DiscIO/SConfig: Rename GetUniqueID to GetGameID

Browse Source 
We call this "game ID" everywhere else, and it's not
actually completely unique.
This commit is contained in:
JosJuice
2016-10-29 14:42:43 +02:00
parent b0e2642883
commit 1081497cad
45 changed files with 104 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Core/ConfigManager.cpp
View File

@ -788,7 +788,7 @@ void SConfig::LoadDefaults()
bJITBranchOff = false;
m_strName = "NONE";
m_strUniqueID = "00000000";
m_strGameID = "00000000";
m_revision = 0;
}
@ -861,7 +861,7 @@ bool SConfig::AutoSetup(EBootBS2 _BootBS2)
return false;
}
m_strName = pVolume->GetInternalName();
m_strUniqueID = pVolume->GetUniqueID();
m_strGameID = pVolume->GetGameID();
m_revision = pVolume->GetRevision();
// Check if we have a Wii disc
@ -939,28 +939,28 @@ bool SConfig::AutoSetup(EBootBS2 _BootBS2)
if (pVolume)
{
m_strName = pVolume->GetInternalName();
m_strUniqueID = pVolume->GetUniqueID();
m_strGameID = pVolume->GetGameID();
}
else
{
// null pVolume means that we are loading from nand folder (Most Likely Wii Menu)
// if this is the second boot we would be using the Name and id of the last title
m_strName.clear();
m_strUniqueID.clear();
m_strGameID.clear();
}
// Use the TitleIDhex for name and/or unique ID if launching from nand folder
// or if it is not ascii characters (specifically sysmenu could potentially apply to other
// things)
// Use the TitleIDhex for name and/or game ID if launching
// from nand folder or if it is not ascii characters
// (specifically sysmenu could potentially apply to other things)
std::string titleidstr = StringFromFormat("%016" PRIx64, ContentLoader.GetTitleID());
if (m_strName.empty())
{
m_strName = titleidstr;
}
if (m_strUniqueID.empty())
if (m_strGameID.empty())
{
m_strUniqueID = titleidstr;
m_strGameID = titleidstr;
}
}
else
@ -1085,17 +1085,17 @@ DiscIO::Language SConfig::GetCurrentLanguage(bool wii) const
IniFile SConfig::LoadDefaultGameIni() const
{
return LoadDefaultGameIni(GetUniqueID(), m_revision);
return LoadDefaultGameIni(GetGameID(), m_revision);
}
IniFile SConfig::LoadLocalGameIni() const
{
return LoadLocalGameIni(GetUniqueID(), m_revision);
return LoadLocalGameIni(GetGameID(), m_revision);
}
IniFile SConfig::LoadGameIni() const
{
return LoadGameIni(GetUniqueID(), m_revision);
return LoadGameIni(GetGameID(), m_revision);
}
IniFile SConfig::LoadDefaultGameIni(const std::string& id, u16 revision)