diff options
| author | JMC47 <JMC4789@gmail.com> | 2022-06-28 13:35:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 13:35:39 -0400 |
| commit | 5d04e1e1de8248da8366f6f99ff4cdbe5467c789 (patch) | |
| tree | 47ff1e96f099cef3443635b982d03e2bf1ce3f04 /Source/Core/VideoCommon/HiresTextures.cpp | |
| parent | e50e45f400856191eafb5f0c6044a8efbf152321 (diff) | |
| parent | 8aef0015fd8903b92cf0aab8a98ee669ec97b5ef (diff) | |
Merge pull request #10518 from iwubcode/draw-mod
Introducing a 'GraphicsMod' system for creators
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 85c9cfc238..9636bfe651 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -213,7 +213,7 @@ void HiresTexture::Prefetch() 10000); } -std::string HiresTexture::GenBaseName(TextureInfo& texture_info, bool dump) +std::string HiresTexture::GenBaseName(const TextureInfo& texture_info, bool dump) { if (!dump && s_textureMap.empty()) return ""; @@ -261,7 +261,7 @@ u32 HiresTexture::CalculateMipCount(u32 width, u32 height) return mip_count; } -std::shared_ptr<HiresTexture> HiresTexture::Search(TextureInfo& texture_info) +std::shared_ptr<HiresTexture> HiresTexture::Search(const TextureInfo& texture_info) { const std::string base_filename = GenBaseName(texture_info); @@ -433,17 +433,17 @@ std::set<std::string> GetTextureDirectoriesWithGameId(const std::string& root_di } } - const auto match_gameid = [game_id](const std::string& filename) { + const auto match_gameid_or_all = [game_id](const std::string& filename) { std::string basename; SplitPath(filename, nullptr, &basename, nullptr); - return basename == game_id || basename == game_id.substr(0, 3); + return basename == game_id || basename == game_id.substr(0, 3) || basename == "all"; }; // Look for any other directories that might be specific to the given gameid const auto files = Common::DoFileSearch({root_directory}, {".txt"}, true); for (const auto& file : files) { - if (match_gameid(file)) + if (match_gameid_or_all(file)) { // The following code is used to calculate the top directory // of a found gameid.txt file |
