|
|
@ -1220,8 +1220,8 @@ private:
|
|
|
|
{
|
|
|
|
{
|
|
|
|
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 && !(other->flags1.bits.dead ||
|
|
|
|
(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)) ||
|
|
|
|
ENUM_ATTR(profession, military, other->profession))) {
|
|
|
|
ENUM_ATTR(profession, military, other->profession))) {
|
|
|
|
dwarf->clear_all = true;
|
|
|
|
dwarf->clear_all = true;
|
|
|
|