Merge branch 'develop' into adv-beta

DFHack · Sep 27, 2024 · 9f00c90 · 9f00c90
2 parents 1d5170a + 8354cee
commit 9f00c90
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -55,6 +55,24 @@ Template for new versions:
 
 ## New Features
 
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 50.14-r1
+
+## New Tools
+
+## New Features
+
 ## Fixes
 - `preserve-rooms`: don't reserve a room for citizens that you expel from the fort
 - `autobutcher`: fix regression in ordering of butcherable animals

diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
@@ -260,7 +260,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(world)
 }
 
 static bool widget_is_visible(df::widget * w) {
-    return w && w->visibility_flags.bits.VISIBILITY_VISIBLE;
+    return w && w->flag.bits.VISIBILITY_VISIBLE;
 }
 
 static size_t get_num_children(df::widget * w) {
@@ -696,7 +696,7 @@ static void add_main_interface_focus_strings(const string &baseFocus, vector<str
         newFocusString += "/ImageCreator";
         focusStrings.push_back(newFocusString);
     }
-    if (game->main_interface.unit_selector.visibility_flags.bits.VISIBILITY_ACTIVE) {
+    if (game->main_interface.unit_selector.flag.bits.VISIBILITY_ACTIVE) {
         newFocusString = baseFocus;
         newFocusString += "/UnitSelector/";
         newFocusString += enum_item_key(game->main_interface.unit_selector.context);

diff --git a/library/xml b/library/xml