From 57e599a4d9e13c90c6ffcca60a7a85daf0ca8150 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Sat, 17 Dec 2022 13:07:37 -0600 Subject: [PATCH] comment out barracks reference barracks appears to have gone away in 50.03 --- CMakeLists.txt | 2 +- library/modules/Gui.cpp | 4 +++- library/xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f95d738b6..a02a23b92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ endif() # set up versioning. set(DF_VERSION "0.50.03") -set(DFHACK_RELEASE "alpha0") +set(DFHACK_RELEASE "alpha0pre1") set(DFHACK_PRERELEASE TRUE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 920292af9..c23d7712d 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -2083,8 +2083,10 @@ bool Gui::inRenameBuilding() { if (!ui_sidebar_menus) return false; - + /* TODO: understand how this changes for v50 return ui_sidebar_menus->barracks.in_rename; + */ + return false; } bool Gui::getViewCoords (int32_t &x, int32_t &y, int32_t &z) diff --git a/library/xml b/library/xml index 02ef33394..7ad3f05c5 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 02ef33394fa391efde85f0239ef493a2a1113bdf +Subproject commit 7ad3f05c5b3608f6fc7fad439cca8acd776dec30