luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 08:35:20 +02:00
Code Activity

Node resolver: Make error on fallback optional, disable for mapgen aliases

Browse Source
This commit is contained in:
Paramat
2018-04-20 20:26:30 +01:00
committed by GitHub
parent 87ad4d8e7f
commit 0e554706ac
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nodedef.cpp
View File

@@ -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;
}