DiscIO/SConfig: Rename GetUniqueID to GetGameID

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

View File

@ -85,7 +85,7 @@ void HiresTexture::Update()
s_textureCache.clear();
}
const std::string& game_id = SConfig::GetInstance().m_strUniqueID;
const std::string& game_id = SConfig::GetInstance().m_strGameID;
const std::string texture_directory = GetTextureDirectory(game_id);
std::vector<std::string> extensions{
".png", ".bmp", ".tga", ".dds",
@ -224,7 +224,7 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
u64 tlut_hash = tlut_size ? GetHashHiresTexture(tlut, (int)tlut_size,
g_ActiveConfig.iSafeTextureCache_ColorSamples) :
0;
name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_strUniqueID.c_str(),
name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_strGameID.c_str(),
(u32)(tex_hash ^ tlut_hash), (u16)format);
if (s_textureMap.find(name) != s_textureMap.end())
{

View File

@ -446,7 +446,7 @@ TextureCacheBase::DoPartialTextureUpdates(TexCache::iterator iter_t, u8* palette
void TextureCacheBase::DumpTexture(TCacheEntryBase* entry, std::string basename, unsigned int level)
{
std::string szDir = File::GetUserPath(D_DUMPTEXTURES_IDX) + SConfig::GetInstance().m_strUniqueID;
std::string szDir = File::GetUserPath(D_DUMPTEXTURES_IDX) + SConfig::GetInstance().m_strGameID;
// make sure that the directory exists
if (!File::Exists(szDir) || !File::IsDirectory(szDir))