Weird compilation error.

develop
expwnent 2013-05-24 15:55:40 -04:00
parent 170fe6a0ef
commit 01c311cf13
1 changed files with 1 additions and 1 deletions

@ -702,7 +702,7 @@ static bool can_spar(df::unit *unit) {
return unit->counters2.exhaustion <= 2000 && // actually 4000, but leave a gap return unit->counters2.exhaustion <= 2000 && // actually 4000, but leave a gap
(unit->status2.limbs_grasp_count > 0 || unit->status2.limbs_grasp_max == 0) && (unit->status2.limbs_grasp_count > 0 || unit->status2.limbs_grasp_max == 0) &&
(!unit->health || (unit->health->flags.whole&0x7FF) == 0) && (!unit->health || (unit->health->flags.whole&0x7FF) == 0) &&
(!unit->job.current_job || unit->job.current_job != job_type::Rest); (!unit->job.current_job || unit->job.current_job->job_type != job_type::Rest);
} }
static bool has_spar_inventory(df::unit *unit, df::job_skill skill) static bool has_spar_inventory(df::unit *unit, df::job_skill skill)