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

Merge remote-tracking branches 'ab9rf/digtype-1243' and 'ab9rf/labormanager-map-check-bug' into develop

develop
lethosor 2018-04-02 00:56:33 -04:00
parent 2c9c935c0e b8de7d4cf8 81c9c8cdfe
commit 996306560b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dig.cpp
Unescape Escape View File

@ -1522,6 +1522,8 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
tt = mCache->tiletypeAt(current); tt = mCache->tiletypeAt(current);
if (!DFHack::isWallTerrain(tt)) if (!DFHack::isWallTerrain(tt))
continue; continue;
if (tileMaterial(tt) != df::enums::tiletype_material::MINERAL)
continue;
//designate it for digging //designate it for digging
df::tile_designation des = mCache->designationAt(current); df::tile_designation des = mCache->designationAt(current);

3
plugins/labormanager/labormanager.cpp
Unescape Escape View File

@ -1075,8 +1075,7 @@ private:
if (bl->designation[x][y].bits.hidden) if (bl->designation[x][y].bits.hidden)
{ {
df::coord p = bl->map_pos; df::coord p = bl->map_pos;
df::coord c(p.x, p.y, p.z - 1); if (! Maps::isTileVisible(p.x, p.y, p.z-1))
if (Maps::getTileDesignation(c)->bits.hidden)
continue; continue;
} }