diff options
| author | number Zero <silverunicorn2011@yandex.ru> | 2017-09-13 23:03:18 +0300 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-11-17 19:23:08 +0000 |
| commit | 05d93c7fa1be9245dd5211b7dc1bdf0961b39eea (patch) | |
| tree | cbf354caa6c100f2e1e5c524d2f959913f52ac0e /src/client.cpp | |
| parent | ae9b1aa1774aedca8f452514d9462c281e36773a (diff) | |
| download | minetest-05d93c7fa1be9245dd5211b7dc1bdf0961b39eea.tar.gz minetest-05d93c7fa1be9245dd5211b7dc1bdf0961b39eea.tar.bz2 minetest-05d93c7fa1be9245dd5211b7dc1bdf0961b39eea.zip | |
Load files from subfolders in texturepacks
Updated and rebased version of a PR by red-001
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client.cpp b/src/client.cpp index bca9f41d0..1a6a87487 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "threading/mutex_auto_lock.h" #include "client/clientevent.h" #include "client/renderingengine.h" +#include "client/tile.h" #include "util/auth.h" #include "util/directiontables.h" #include "util/pointedthing.h" @@ -1643,9 +1644,8 @@ void Client::afterContentReceived() text = wgettext("Initializing nodes..."); RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 72); m_nodedef->updateAliases(m_itemdef); - std::string texture_path = g_settings->get("texture_path"); - if (!texture_path.empty() && fs::IsDir(texture_path)) - m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt"); + for (const auto &path : getTextureDirs()) + m_nodedef->applyTextureOverrides(path + DIR_DELIM + "override.txt"); m_nodedef->setNodeRegistrationStatus(true); m_nodedef->runNodeResolveCallbacks(); delete[] text; |