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

paramat · web-flow · commit 0e554706ac24 · 2018-04-20T20:26:30.000+01:00
diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp
@@ -317,16 +317,16 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 po
 
 void Biome::resolveNodeNames()
 {
-	getIdFromNrBacklog(&c_top,           "mapgen_stone",              CONTENT_AIR);
-	getIdFromNrBacklog(&c_filler,        "mapgen_stone",              CONTENT_AIR);
-	getIdFromNrBacklog(&c_stone,         "mapgen_stone",              CONTENT_AIR);
-	getIdFromNrBacklog(&c_water_top,     "mapgen_water_source",       CONTENT_AIR);
-	getIdFromNrBacklog(&c_water,         "mapgen_water_source",       CONTENT_AIR);
-	getIdFromNrBacklog(&c_river_water,   "mapgen_river_water_source", CONTENT_AIR);
-	getIdFromNrBacklog(&c_riverbed,      "mapgen_stone",              CONTENT_AIR);
-	getIdFromNrBacklog(&c_dust,          "ignore",                    CONTENT_IGNORE);
-	getIdFromNrBacklog(&c_cave_liquid,   "ignore",                    CONTENT_IGNORE);
-	getIdFromNrBacklog(&c_dungeon,       "ignore",                    CONTENT_IGNORE);
-	getIdFromNrBacklog(&c_dungeon_alt,   "ignore",                    CONTENT_IGNORE);
-	getIdFromNrBacklog(&c_dungeon_stair, "ignore",                    CONTENT_IGNORE);
+	getIdFromNrBacklog(&c_top,           "mapgen_stone",              CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_filler,        "mapgen_stone",              CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_stone,         "mapgen_stone",              CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_water_top,     "mapgen_water_source",       CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_water,         "mapgen_water_source",       CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_river_water,   "mapgen_river_water_source", CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_riverbed,      "mapgen_stone",              CONTENT_AIR,    false);
+	getIdFromNrBacklog(&c_dust,          "ignore",                    CONTENT_IGNORE, false);
+	getIdFromNrBacklog(&c_cave_liquid,   "ignore",                    CONTENT_IGNORE, false);
+	getIdFromNrBacklog(&c_dungeon,       "ignore",                    CONTENT_IGNORE, false);
+	getIdFromNrBacklog(&c_dungeon_alt,   "ignore",                    CONTENT_IGNORE, false);
+	getIdFromNrBacklog(&c_dungeon_stair, "ignore",                    CONTENT_IGNORE, false);
 }
diff --git 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;
 	}
 
diff --git a/src/nodedef.h b/src/nodedef.h
@@ -733,9 +733,10 @@ class NodeResolver {
 	virtual void resolveNodeNames() = 0;
 
 	bool 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 = true);
 	bool getIdsFromNrBacklog(std::vector<content_t> *result_out,
-		bool all_required=false, content_t c_fallback=CONTENT_IGNORE);
+		bool all_required = false, content_t c_fallback = CONTENT_IGNORE);
 
 	void nodeResolveInternal();
 

Original file line number	Diff line number	Diff line change
`@@ -1621,7 +1621,7 @@ void NodeResolver::nodeResolveInternal()`
`1621`	`1621`
`1622`	`1622`
`1623`	`1623`	`bool NodeResolver::getIdFromNrBacklog(content_t *result_out,`
`1624`		`- const std::string &node_alt, content_t c_fallback)`
	`1624`	`+ const std::string &node_alt, content_t c_fallback, bool error_on_fallback)`
`1625`	`1625`	`{`
`1626`	`1626`	`if (m_nodenames_idx == m_nodenames.size()) {`
`1627`	`1627`	`*result_out = c_fallback;`
`@@ -1639,8 +1639,9 @@ bool NodeResolver::getIdFromNrBacklog(content_t *result_out,`
`1639`	`1639`	`}`
`1640`	`1640`
`1641`	`1641`	`if (!success) {`
`1642`		`- errorstream << "NodeResolver: failed to resolve node name '" << name`
`1643`		`- << "'." << std::endl;`
	`1642`	`+ if (error_on_fallback)`
	`1643`	`+ errorstream << "NodeResolver: failed to resolve node name '" << name`
	`1644`	`+ << "'." << std::endl;`
`1644`	`1645`	`c = c_fallback;`
`1645`	`1646`	`}`
`1646`	`1647`