diff options
| author | JosJuice <josjuice@gmail.com> | 2016-01-06 19:35:16 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2016-01-06 19:35:16 +0100 |
| commit | 03091ce18058f0fa3ab229ec25ac04a04c5f2fc2 (patch) | |
| tree | 75d8f63b48378b101dd1a3e333b2c08adbf8810d /Source/Core/VideoCommon/HiresTextures.cpp | |
| parent | 42237dc511996cdb3e738ba3d0c467da6633881f (diff) | |
HiresTextures: Refactor getting directory
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index ec5e229499..151d21822d 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -87,12 +87,7 @@ void HiresTexture::Update() } const std::string& game_id = SConfig::GetInstance().m_strUniqueID; - std::string texture_directory = GetTextureFolder(game_id); - - // If there's no directory with the region-specific ID, look for a 3-character region-free one - if (!File::Exists(texture_directory)) - texture_directory = GetTextureFolder(game_id.substr(0, 3)); - + const std::string texture_directory = GetTextureDirectory(game_id); std::vector<std::string> extensions { ".png", ".bmp", @@ -439,9 +434,15 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam return ret; } -std::string HiresTexture::GetTextureFolder(const std::string& game_id) +std::string HiresTexture::GetTextureDirectory(const std::string& game_id) { - return File::GetUserPath(D_HIRESTEXTURES_IDX) + game_id; + const std::string texture_directory = File::GetUserPath(D_HIRESTEXTURES_IDX) + game_id; + + // If there's no directory with the region-specific ID, look for a 3-character region-free one + if (!File::Exists(texture_directory)) + return File::GetUserPath(D_HIRESTEXTURES_IDX) + game_id.substr(0, 3); + + return texture_directory; } HiresTexture::~HiresTexture() |
