aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSmallJoker <mk939@ymail.com>2016-07-17 22:26:23 +0200
committerparamat <mat.gregory@virginmedia.com>2016-10-08 00:08:50 +0100
commitd4a2e23793d2260f263396480b6552a37c8ebf6b (patch)
tree5afdafd05dbe18a3c44eedda51e2cb439826d84e
parent0a16e53b40d347db7dcd04cb694d0f8f2ed1a5a7 (diff)
downloadminetest-d4a2e23793d2260f263396480b6552a37c8ebf6b.tar.gz
minetest-d4a2e23793d2260f263396480b6552a37c8ebf6b.tar.bz2
minetest-d4a2e23793d2260f263396480b6552a37c8ebf6b.zip
Textures: Ignore unknown node in override.txt
-rw-r--r--src/nodedef.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index bfb2999bd..fa2e621f2 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -1144,13 +1144,8 @@ void CNodeDefManager::applyTextureOverrides(const std::string &override_filepath
}
content_t id;
- if (!getId(splitted[0], id)) {
- infostream << override_filepath
- << ":" << line_c << " Could not apply texture override \""
- << line << "\": Unknown node \""
- << splitted[0] << "\"" << std::endl;
- continue;
- }
+ if (!getId(splitted[0], id))
+ continue; // Ignore unknown node
ContentFeatures &nodedef = m_content_features[id];