summaryrefslogtreecommitdiff
path: root/plugins/autolabor.cpp
diff options
context:
space:
mode:
authorRossM2012-03-30 10:01:33 -0700
committerRossM2012-03-30 10:01:33 -0700
commit590ea629f36dd1b37fc980104654434278a9f476 (patch)
treeb67ea5a4b90f9bf6c6ec98e246ab510390356df6 /plugins/autolabor.cpp
parent39f722339c10bfb381df26f8cfc027e9793201d0 (diff)
downloaddfhack-590ea629f36dd1b37fc980104654434278a9f476.tar.gz
dfhack-590ea629f36dd1b37fc980104654434278a9f476.tar.bz2
dfhack-590ea629f36dd1b37fc980104654434278a9f476.tar.xz
Don't try to give labors to merchant guards or dead dwarves.
Diffstat (limited to 'plugins/autolabor.cpp')
-rw-r--r--plugins/autolabor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp
index 3ef0f9e5..f748738b 100644
--- a/plugins/autolabor.cpp
+++ b/plugins/autolabor.cpp
@@ -457,7 +457,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
for (int i = 0; i < world->units.all.size(); ++i)
{
df::unit* cre = world->units.all[i];
- if (cre->race == race && cre->civ_id == civ && !cre->flags1.bits.marauder && !cre->flags1.bits.diplomat && !cre->flags1.bits.merchant && !cre->flags1.bits.dead) {
+ if (cre->race == race && cre->civ_id == civ && !cre->flags1.bits.marauder && !cre->flags1.bits.diplomat && !cre->flags1.bits.merchant &&
+ !cre->flags1.bits.dead && !cre->flags1.bits.forest) {
dwarfs.push_back(cre);
}
}