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

Merge pull request #7349 from Techjar/texture-wildcard-fix 

VideoCommon/HiresTextures: Change wildcard to a Windows-compatible character
This commit is contained in:
Pierre Bourdon 2018-08-22 14:55:23 +02:00 committed by GitHub
parent d44087128e 5512eadd08
commit 74cbc6cde0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -254,8 +254,8 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
std::string fullname = basename + tlutname + formatname; std::string fullname = basename + tlutname + formatname;
// try to match a wildcard template // try to match a wildcard template
if (!dump && s_textureMap.find(basename + "_*" + formatname) != s_textureMap.end()) if (!dump && s_textureMap.find(basename + "_$" + formatname) != s_textureMap.end())
return basename + "_*" + formatname; return basename + "_$" + formatname;
// else generate the complete texture // else generate the complete texture
if (dump || s_textureMap.find(fullname) != s_textureMap.end()) if (dump || s_textureMap.find(fullname) != s_textureMap.end())