diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-10-31 12:39:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 12:39:27 +0100 |
| commit | d5ca153c26a9eae2084a3ff8d4a8d5cd1acf56ac (patch) | |
| tree | 5c888bea55127f46f2eb9c9fc7f3e79a588a4343 /Source/Core/VideoCommon | |
| parent | 22779473bcfcb7f90f512606c0f584f0db450ba5 (diff) | |
| parent | 1081497cad9c70c5b66552e20bbc00657a05f0e5 (diff) | |
Merge pull request #4401 from JosJuice/rename-getuniqueid
DiscIO/SConfig: Rename GetUniqueID to GetGameID
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 56798d006e..e9589f7218 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -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()) { diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 0f8a39b341..05546f940e 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -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)) |