Merge pull request #5567 from chdoc/job-helpers

two minor fixes for #5535

Author: ab9rf

docs/dev/Lua API.rst

@@ -1908,11 +1908,12 @@ Units module
 
   Unit has an uninterruptible social activity (e.g. a purple "Socialize!").
 
-* ``dfhack.units.isJobAvailable(unit [, interrupt_social])``
+* ``dfhack.units.isJobAvailable(unit [, preserve_social])``
 
   Check whether a unit can be assigned to (i.e. is looking for) a job. Will
   return ``true`` if the unit is engaged in "green" social activities, unless
-  the boolean ``interrupt_social`` is true.
+  the boolean ``preserve_social`` is true. Will never interrupt uninterruptible
+  social activities (e.g. a purple "Socialize!").
 
 * ``dfhack.units.getFocusPenalty(unit, need_type [, need_type, ...])``
 

library/include/modules/Units.h

@@ -350,7 +350,7 @@ DFHACK_EXPORT int32_t getFocusPenalty(df::unit* unit, df::need_type need_type);
 // unit has an unbailable social activity (e.g. "Socialize!")
 DFHACK_EXPORT bool hasUnbailableSocialActivity(df::unit *unit);
 // unit can be assigned a job
-DFHACK_EXPORT bool isJobAvailable(df::unit *unit, bool interrupt_social);
+DFHACK_EXPORT bool isJobAvailable(df::unit *unit, bool preserve_social);
 
 // Stress categories. 0 is highest stress, 6 is lowest.
 DFHACK_EXPORT extern const std::vector<int32_t> stress_cutoffs;

library/modules/Units.cpp

@@ -2090,6 +2090,8 @@ bool Units::isJobAvailable(df::unit *unit, bool preserve_social = false){
         return false;
     if (unit->flags1.bits.caged || unit->flags1.bits.chained)
         return false;
+    if (Units::getSpecificRef(unit, df::specific_ref_type::ACTIVITY))
+        return false;
     if (unit->individual_drills.size() > 0) {
         if (unit->individual_drills.size() > 1)
             return false; // this is even possible