From 0e554706ac244b9eebc62e52fccb1a4b9e81d2a4 Mon Sep 17 00:00:00 2001 From: Paramat Date: Fri, 20 Apr 2018 20:26:30 +0100 Subject: Node resolver: Make error on fallback optional, disable for mapgen aliases --- src/nodedef.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/nodedef.cpp') diff --git a/src/nodedef.cpp b/src/nodedef.cpp index eb1763166..e40a45f97 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -1621,7 +1621,7 @@ void NodeResolver::nodeResolveInternal() bool NodeResolver::getIdFromNrBacklog(content_t *result_out, - const std::string &node_alt, content_t c_fallback) + const std::string &node_alt, content_t c_fallback, bool error_on_fallback) { if (m_nodenames_idx == m_nodenames.size()) { *result_out = c_fallback; @@ -1639,8 +1639,9 @@ bool NodeResolver::getIdFromNrBacklog(content_t *result_out, } if (!success) { - errorstream << "NodeResolver: failed to resolve node name '" << name - << "'." << std::endl; + if (error_on_fallback) + errorstream << "NodeResolver: failed to resolve node name '" << name + << "'." << std::endl; c = c_fallback; } -- cgit v1.2.3