diff options
| author | Paramat <paramat@users.noreply.github.com> | 2018-04-20 20:26:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 20:26:30 +0100 |
| commit | 0e554706ac244b9eebc62e52fccb1a4b9e81d2a4 (patch) | |
| tree | 25453cc7f520495e167527c90f2f0044860a1872 | |
| parent | 87ad4d8e7f25210cd28d9f2b372aa00aa3dab929 (diff) | |
| download | minetest-0e554706ac244b9eebc62e52fccb1a4b9e81d2a4.tar.gz minetest-0e554706ac244b9eebc62e52fccb1a4b9e81d2a4.tar.bz2 minetest-0e554706ac244b9eebc62e52fccb1a4b9e81d2a4.zip | |
Node resolver: Make error on fallback optional, disable for mapgen aliases
| -rw-r--r-- | src/mapgen/mg_biome.cpp | 24 | ||||
| -rw-r--r-- | src/nodedef.cpp | 7 | ||||
| -rw-r--r-- | src/nodedef.h | 5 |
3 files changed, 19 insertions, 17 deletions
diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp index 16e276b53..a6ee41179 100644 --- 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 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; } diff --git a/src/nodedef.h b/src/nodedef.h index f99f7f321..058eebb7e 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -733,9 +733,10 @@ public: 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(); |