Skip to content
Permalink
Browse files

Textures: Load base pack only as last fallback (#8974)

  • Loading branch information
SmallJoker committed Sep 29, 2019
1 parent c2458d3 commit 61e9c1b0dd7da9cf45969875a89af5203910d290
Showing with 14 additions and 5 deletions.
  1. +13 −4 src/client/tile.cpp
  2. +1 −1 src/client/tile.h
@@ -122,9 +122,14 @@ std::string getImagePath(std::string path)
Utilizes a thread-safe cache.
*/
std::string getTexturePath(const std::string &filename)
std::string getTexturePath(const std::string &filename, bool *is_base_pack)
{
std::string fullpath;

// This can set a wrong value on cached textures, but is irrelevant because
// is_base_pack is only passed when initializing the textures the first time
if (is_base_pack)
*is_base_pack = false;
/*
Check from cache
*/
@@ -154,6 +159,8 @@ std::string getTexturePath(const std::string &filename)
std::string testpath = base_path + DIR_DELIM + filename;
// Check all filename extensions. Returns "" if not found.
fullpath = getImagePath(testpath);
if (is_base_pack && !fullpath.empty())
*is_base_pack = true;
}

// Add to cache (also an empty result is cached)
@@ -215,9 +222,11 @@ class SourceImageCache
bool need_to_grab = true;

// Try to use local texture instead if asked to
if (prefer_local){
std::string path = getTexturePath(name);
if (!path.empty()) {
if (prefer_local) {
bool is_base_pack;
std::string path = getTexturePath(name, &is_base_pack);
// Ignore base pack
if (!path.empty() && !is_base_pack) {
video::IImage *img2 = RenderingEngine::get_video_driver()->
createImageFromFile(path.c_str());
if (img2){
@@ -64,7 +64,7 @@ std::string getImagePath(std::string path);
Utilizes a thread-safe cache.
*/
std::string getTexturePath(const std::string &filename);
std::string getTexturePath(const std::string &filename, bool *is_base_pack = nullptr);

void clearTextureNameCache();

0 comments on commit 61e9c1b

Please sign in to comment.
You can’t perform that action at this time.