diff --git a/CMakeLists.txt b/CMakeLists.txt index a86e55cb3a..5817107a42 100644 --- 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 "r5") -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 index 184f405ae2..295e779a6b 100644 --- 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);