diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp index af2cd5183..2b2311a7c 100644 --- a/library/modules/Maps.cpp +++ b/library/modules/Maps.cpp @@ -91,7 +91,7 @@ const char * DFHack::sa_feature(df::feature_type index) return "Cavern"; case feature_type::magma_core_from_layer: return "Magma sea"; - case feature_type::feature_underworld_from_layer: + case feature_type::underworld_from_layer: return "Underworld"; default: return "Unknown/Error"; diff --git a/library/xml b/library/xml index 3322beb2e..888f24622 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 3322beb2e7f4b28ff8e573e9bec738c77026b8e9 +Subproject commit 888f24622990c11db5c392f5e241e0de28d2bb9e diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp index 522630afe..32e360a3a 100644 --- a/plugins/prospector.cpp +++ b/plugins/prospector.cpp @@ -721,7 +721,7 @@ command_result prospector (color_ostream &con, vector & parameters) } if (showSlade && blockFeatureGlobal.type != -1 && des.bits.feature_global - && blockFeatureGlobal.type == feature_type::feature_underworld_from_layer + && blockFeatureGlobal.type == feature_type::underworld_from_layer && blockFeatureGlobal.main_material == 0) // stone { layerMats[blockFeatureGlobal.sub_material].add(global_z); diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp index 314259fd4..c2479bedc 100644 --- a/plugins/reveal.cpp +++ b/plugins/reveal.cpp @@ -44,7 +44,7 @@ bool isSafe(df::coord c) if (local_feature.type == feature_type::deep_special_tube || local_feature.type == feature_type::deep_surface_portal) return false; // And Hell *is* Hell. - if (global_feature.type == feature_type::feature_underworld_from_layer) + if (global_feature.type == feature_type::underworld_from_layer) return false; // otherwise it's safe. return true;