update for 50.14

myk002 · myk002 · commit 5ae7a58df0bb · 2024-09-04T10:16:34.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,9 @@ cmake_policy(SET CMP0074 NEW)
 project(dfhack)
 
 # set up versioning.
-set(DF_VERSION "50.13")
-set(DFHACK_RELEASE "r4")
-set(DFHACK_PRERELEASE FALSE)
+set(DF_VERSION "50.14")
+set(DFHACK_RELEASE "beta")
+set(DFHACK_PRERELEASE TRUE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 set(DFHACK_ABI_VERSION 2)
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
@@ -258,7 +258,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(world)
 }
 
 static bool widget_is_visible(df::widget * w) {
-    return w && w->visibility_flags.bits.WIDGET_VISIBILITY_VISIBLE;
+    return w && w->flag.bits.WIDGET_VISIBILITY_VISIBLE;
 }
 
 static size_t get_num_children(df::widget * w) {
@@ -700,7 +700,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
         newFocusString += "/ImageCreator";
         focusStrings.push_back(newFocusString);
     }
-    if (game->main_interface.unit_selector.visibility_flags.bits.WIDGET_VISIBILITY_ACTIVE) {
+    if (game->main_interface.unit_selector.flag.bits.WIDGET_VISIBILITY_ACTIVE) {
         newFocusString = baseFocus;
         newFocusString += "/UnitSelector/";
         newFocusString += enum_item_key(game->main_interface.unit_selector.context);
diff --git a/library/xml b/library/xml
@@ -1 +1 @@
-Subproject commit 86c5648f9ed2cffdf08d105035b08ac0850c1f44
+Subproject commit 1c9783e59746a002c47942c2c2d804c9948245b7

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(world)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`static bool widget_is_visible(df::widget * w) {`
`261`		`- return w && w->visibility_flags.bits.WIDGET_VISIBILITY_VISIBLE;`
	`261`	`+ return w && w->flag.bits.WIDGET_VISIBILITY_VISIBLE;`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`static size_t get_num_children(df::widget * w) {`
`@@ -700,7 +700,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)`
`700`	`700`	`newFocusString += "/ImageCreator";`
`701`	`701`	`focusStrings.push_back(newFocusString);`
`702`	`702`	`}`
`703`		`- if (game->main_interface.unit_selector.visibility_flags.bits.WIDGET_VISIBILITY_ACTIVE) {`
	`703`	`+ if (game->main_interface.unit_selector.flag.bits.WIDGET_VISIBILITY_ACTIVE) {`
`704`	`704`	`newFocusString = baseFocus;`
`705`	`705`	`newFocusString += "/UnitSelector/";`
`706`	`706`	`newFocusString += enum_item_key(game->main_interface.unit_selector.context);`