diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-08-22 14:55:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 14:55:23 +0200 |
| commit | 74cbc6cde0816c9abcd436c03e6d7fb4587ccaf3 (patch) | |
| tree | 4fd0464e4380e610a67633fe702e7ca104c8e53c /Source | |
| parent | d44087128edff4aac935c9be8fc6753435db922a (diff) | |
| parent | 5512eadd08778817b4b0b9dfdda1e78394095d58 (diff) | |
Merge pull request #7349 from Techjar/texture-wildcard-fix
VideoCommon/HiresTextures: Change wildcard to a Windows-compatible character
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 79e71fa32b..70b9df00be 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -254,8 +254,8 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co std::string fullname = basename + tlutname + formatname; // try to match a wildcard template - if (!dump && s_textureMap.find(basename + "_*" + formatname) != s_textureMap.end()) - return basename + "_*" + formatname; + if (!dump && s_textureMap.find(basename + "_$" + formatname) != s_textureMap.end()) + return basename + "_$" + formatname; // else generate the complete texture if (dump || s_textureMap.find(fullname) != s_textureMap.end()) |