diff options
| author | Hugues Ross <hugues.ross@gmail.com> | 2020-04-14 14:41:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 20:41:29 +0200 |
| commit | 5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7 (patch) | |
| tree | de590965f9f1cf68a4b6ee7ca802aaa5c0b987ee /src/client | |
| parent | 7e21b3cd4883eb8b9eb7e9ca49e50f6f0c7bc0d6 (diff) | |
| download | hax-minetest-server-5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7.tar.gz hax-minetest-server-5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7.zip | |
Refactor texture overrides and add new features (#9600)
* Refactor texture overrides, and add new features:
- Texture overrides can support multiple targets in one line
- Texture override files can have comment lines
- Item images/wield images can be overridden
* Formatting changes
* Address soime feedback
- Pass vectors by const reference
- Log syntax errors as warnings
- Remove 'C' prefix from TextureOverrideSource
* Simplify override target checks with an inline helper function
* make linter happy
* Apply feedback suggestions
Co-Authored-By: rubenwardy <rw@rubenwardy.com>
* Remove remaining != 0 checks
* Update copyright notice
Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: rubenwardy <rw@rubenwardy.com>
Diffstat (limited to '')
| -rw-r--r-- | src/client/client.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/client/client.cpp b/src/client/client.cpp index c3e2a4d2a..8ee0869cd 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1742,8 +1742,11 @@ void Client::afterContentReceived() text = wgettext("Initializing nodes..."); RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 72); m_nodedef->updateAliases(m_itemdef); - for (const auto &path : getTextureDirs()) - m_nodedef->applyTextureOverrides(path + DIR_DELIM + "override.txt"); + for (const auto &path : getTextureDirs()) { + TextureOverrideSource override_source(path + DIR_DELIM + "override.txt"); + m_nodedef->applyTextureOverrides(override_source.getNodeTileOverrides()); + m_itemdef->applyTextureOverrides(override_source.getItemTextureOverrides()); + } m_nodedef->setNodeRegistrationStatus(true); m_nodedef->runNodeResolveCallbacks(); delete[] text; |