Merge pull request #4954 from myk002/myk_is_gay

[Units] fix regression in Units::isGay()

Author: myk002

docs/changelog.txt

@@ -57,6 +57,7 @@ Template for new versions:
 
 ## Fixes
 - `preserve-rooms`: don't reserve a room for citizens that you expel from the fort
+- `autobutcher`: fix regression in ordering of butcherable animals
 
 ## Misc Improvements
 

library/modules/Units.cpp

@@ -312,9 +312,9 @@ bool Units::isGay(df::unit *unit) {
     if (!unit->status.current_soul)
         return false;
 
-    auto &o_flag = unit->status.current_soul->orientation_flags;
-    return (!isFemale(unit) || !(o_flag.bits.marry_male && o_flag.bits.romance_male))
-        && (!isMale(unit) || !(o_flag.bits.marry_female && o_flag.bits.romance_female));
+    df::orientation_flags orientation = unit->status.current_soul->orientation_flags;
+    return (!Units::isFemale(unit) || !(orientation.whole & (orientation.mask_marry_male | orientation.mask_romance_male)))
+           && (!Units::isMale(unit) || !(orientation.whole & (orientation.mask_marry_female | orientation.mask_romance_female)));
 }
 
 bool Units::isNaked(df::unit *unit, bool no_items) {

plugins/autobutcher.cpp

@@ -213,7 +213,7 @@ static void doMarkForSlaughter(df::unit *unit) {
     unit->flags2.bits.slaughter = 1;
 }
 
-// returns true if a should be butchered before b
+// returns true if b should be butchered before a
 static bool compareKids(df::unit *a, df::unit *b) {
     if (isHighPriority(a) != isHighPriority(b))
         return isHighPriority(b);
@@ -222,7 +222,7 @@ static bool compareKids(df::unit *a, df::unit *b) {
     return Units::getAge(a, true) > Units::getAge(b, true);
 }
 
-// returns true if a should be butchered before b
+// returns true if b should be butchered before a
 static bool compareAdults(df::unit* a, df::unit* b) {
     if (isHighPriority(a) != isHighPriority(b))
         return isHighPriority(b);