Merge branch '0.34.11-r3-bugfixes'

NEWS

@@ -10,9 +10,11 @@ DFHack v0.34.11-r3
     - Maps::canStepBetween: returns whether you can walk between two tiles in one step.
     - EventManager: monitors various in game events centrally so that individual plugins
       don't have to monitor the same things redundantly.
+    - Now works with OSX 10.6.8
   Notable bugfixes:
     - autobutcher can be re-enabled again after being stopped.
     - stopped Dwarf Manipulator from unmasking vampires.
+    - Stonesense is now fixed on OSX
   Misc improvements:
     - fastdwarf: new mode using debug flags, and some internal consistency fixes.
     - added a small stand-alone utility for applying and removing binary patches.

plugins/CMakeLists.txt

@@ -1,11 +1,7 @@
 INCLUDE(Plugins.cmake)
 
 # Dfusion plugin
-IF(UNIX)
-    OPTION(BUILD_DFUSION "Build DFusion." OFF)
-ELSE()
-    OPTION(BUILD_DFUSION "Build DFusion." ON)
-ENDIF()
+OPTION(BUILD_DFUSION "Build DFusion." ON)
 if(BUILD_DFUSION)
     add_subdirectory (Dfusion)
 endif()

plugins/stonesense

@@ -1 +1 @@
-Subproject commit 83e2b8a3754e2feb0d5bf106d2b43ff71ff63935
+Subproject commit 670b4ff6300e8134dc6402336474626e548d0a07

plugins/tweak.cpp

@@ -702,7 +702,7 @@ static bool can_spar(df::unit *unit) {
     return unit->counters2.exhaustion <= 2000 && // actually 4000, but leave a gap
            (unit->status2.limbs_grasp_count > 0 || unit->status2.limbs_grasp_max == 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)