Fix build and allow autodump to any walkable tile (e.g. a stair).

develop
Alexander Gavrilov 2012-07-06 20:11:20 +04:00
parent 07dc20055a
commit 4bbb185f7b
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit ad38c5e96b05fedf16114fd16bd463e933f13582 Subproject commit b646637f8eb901a95c82e60ccd4713e763e00179

@ -140,7 +140,7 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
return CR_FAILURE; return CR_FAILURE;
} }
df::tiletype ttype = MC.tiletypeAt(pos_cursor); 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"); out.printerr("Cursor should be placed over a floor.\n");
return CR_FAILURE; return CR_FAILURE;

@ -740,7 +740,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
else if (df::enums::building_type::TradeDepot == type) else if (df::enums::building_type::TradeDepot == type)
{ {
df::building_tradedepotst* depot = (df::building_tradedepotst*) build; 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) if (print_debug)
out.print("Trade depot found and trader requested, trader will be excluded from all labors.\n"); out.print("Trade depot found and trader requested, trader will be excluded from all labors.\n");
} }