MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1184 from quietust/develop 

update structures
develop
Lethosor 2017-11-23 11:57:41 -05:00 committed by GitHub
parent 30d17398c1 33a43c5bfd
commit 9259cb22d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/modules/Maps.cpp
Unescape Escape View File

@ -91,7 +91,7 @@ const char * DFHack::sa_feature(df::feature_type index)
return "Cavern"; return "Cavern";
case feature_type::magma_core_from_layer: case feature_type::magma_core_from_layer:
return "Magma sea"; return "Magma sea";
case feature_type::feature_underworld_from_layer: case feature_type::underworld_from_layer:
return "Underworld"; return "Underworld";
default: default:
return "Unknown/Error"; return "Unknown/Error";

2
library/xml

@ -1 +1 @@
Subproject commit 3322beb2e7f4b28ff8e573e9bec738c77026b8e9 Subproject commit 888f24622990c11db5c392f5e241e0de28d2bb9e

2
plugins/prospector.cpp
Unescape Escape View File

@ -721,7 +721,7 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
} }
if (showSlade && blockFeatureGlobal.type != -1 && des.bits.feature_global 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 && blockFeatureGlobal.main_material == 0) // stone
{ {
layerMats[blockFeatureGlobal.sub_material].add(global_z); layerMats[blockFeatureGlobal.sub_material].add(global_z);

2
plugins/reveal.cpp
Unescape Escape View File

@ -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) if (local_feature.type == feature_type::deep_special_tube || local_feature.type == feature_type::deep_surface_portal)
return false; return false;
// And Hell *is* Hell. // 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; return false;
// otherwise it's safe. // otherwise it's safe.
return true; return true;