From 4bbb185f7ba546fbab44e275fa243abb764e7571 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Fri, 6 Jul 2012 20:11:20 +0400 Subject: [PATCH] Fix build and allow autodump to any walkable tile (e.g. a stair). --- library/xml | 2 +- plugins/autodump.cpp | 2 +- plugins/autolabor.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/xml b/library/xml index ad38c5e96..b646637f8 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit ad38c5e96b05fedf16114fd16bd463e933f13582 +Subproject commit b646637f8eb901a95c82e60ccd4713e763e00179 diff --git a/plugins/autodump.cpp b/plugins/autodump.cpp index 536b2501b..cfb73fa8b 100644 --- a/plugins/autodump.cpp +++ b/plugins/autodump.cpp @@ -140,7 +140,7 @@ static command_result autodump_main(color_ostream &out, vector & parame return CR_FAILURE; } df::tiletype ttype = MC.tiletypeAt(pos_cursor); - if(!DFHack::isFloorTerrain(ttype)) + if(!DFHack::isWalkable(ttype) || DFHack::isOpenTerrain(ttype)) { out.printerr("Cursor should be placed over a floor.\n"); return CR_FAILURE; diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp index de1a1aef6..3bae1e1b3 100644 --- a/plugins/autolabor.cpp +++ b/plugins/autolabor.cpp @@ -740,7 +740,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out ) else if (df::enums::building_type::TradeDepot == type) { df::building_tradedepotst* depot = (df::building_tradedepotst*) build; - trader_requested = depot->flags.bits.trader_requested; + trader_requested = depot->trade_flags.bits.trader_requested; if (print_debug) out.print("Trade depot found and trader requested, trader will be excluded from all labors.\n"); }