From e77c9dc730fdd94423319b744fb4162bd36e8377 Mon Sep 17 00:00:00 2001 From: Kelly Martin Date: Tue, 15 May 2012 13:42:48 -0500 Subject: [PATCH] Add new PUSH_HAUL_VEHICLES labor to autolabor. This commit will only work with 0.34.08 (or later). --- library/xml | 2 +- plugins/autolabor.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/library/xml b/library/xml index 8a9a76b9d..92dbeb626 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 8a9a76b9d0459992a62bf054a6df98483a3b14eb +Subproject commit 92dbeb6267a24a35babe3d5326801f2e8cfd22e1 diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp index 5a588cdde..d89ddd7c6 100644 --- a/plugins/autolabor.cpp +++ b/plugins/autolabor.cpp @@ -458,7 +458,8 @@ static const struct labor_default default_labor_infos[] = { /* GLAZING */ {AUTOMATIC, false, 1, 200, 0}, /* PRESSING */ {AUTOMATIC, false, 1, 200, 0}, /* BEEKEEPING */ {AUTOMATIC, false, 1, 1, 0}, // reduce risk of stuck beekeepers (see http://www.bay12games.com/dwarves/mantisbt/view.php?id=3981) - /* WAX_WORKING */ {AUTOMATIC, false, 1, 200, 0}, + /* WAX_WORKING */ {AUTOMATIC, false, 1, 200, 0}, + /* PUSH_HAUL_VEHICLES */ {HAULERS, false, 1, 200, 0} }; static const int responsibility_penalties[] = { @@ -1271,7 +1272,7 @@ command_result autolabor (color_ostream &out, std::vector & parame if (labor == df::enums::unit_labor::NONE) { - out.printerr("Could not find labor %s.", parameters[0].c_str()); + out.printerr("Could not find labor %s.\n", parameters[0].c_str()); return CR_WRONG_USAGE; }