MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dead flag -> !isActive

develop
PatrikLundell 2018-06-14 12:31:52 +02:00
parent da0aa85b05
commit b38dfe2e43
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/labormanager/labormanager.cpp
Unescape Escape View File

@ -1224,7 +1224,7 @@ private:
if (p1 || p2) if (p1 || p2)
{ {
df::unit* other = p1 ? act->unit_noble : act->unit_actor; df::unit* other = p1 ? act->unit_noble : act->unit_actor;
if (other && !(other->flags1.bits.dead || if (other && !(!Units::isActive(other) ||
(other->job.current_job && (other->job.current_job &&
(other->job.current_job->job_type == df::job_type::Sleep || (other->job.current_job->job_type == df::job_type::Sleep ||
other->job.current_job->job_type == df::job_type::Rest)) || other->job.current_job->job_type == df::job_type::Rest)) ||
@ -1247,7 +1247,7 @@ private:
for (auto u2 = world->units.active.begin(); u2 != world->units.active.end(); ++u2) for (auto u2 = world->units.active.begin(); u2 != world->units.active.end(); ++u2)
{ {
if ((*u2)->relationship_ids[df::unit_relationship_type::Mother] == dwarf->dwarf->id && if ((*u2)->relationship_ids[df::unit_relationship_type::Mother] == dwarf->dwarf->id &&
!(*u2)->flags1.bits.dead && Units::isActive(*u2) &&
((*u2)->profession == df::profession::CHILD || (*u2)->profession == df::profession::BABY)) ((*u2)->profession == df::profession::CHILD || (*u2)->profession == df::profession::BABY))
{ {
dwarf->has_children = true; dwarf->has_children = true;