Don't try to give labors to merchant guards or dead dwarves.

develop
RossM 2012-03-30 10:01:33 -07:00
parent 39f722339c
commit 590ea629f3
1 changed files with 2 additions and 1 deletions

@ -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);
}
}