From 82dc1445cf86160cd3e7d33718b7229c1f591fc6 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Thu, 20 Sep 2012 11:55:53 +0400 Subject: [PATCH] Support the Room list in getSelectedBuilding. --- library/modules/Gui.cpp | 4 ++++ library/xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index bc7deedc8..eaeef9bf4 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -53,6 +53,7 @@ using namespace DFHack; #include "df/viewscreen_dungeon_monsterstatusst.h" #include "df/viewscreen_joblistst.h" #include "df/viewscreen_unitlistst.h" +#include "df/viewscreen_buildinglistst.h" #include "df/viewscreen_itemst.h" #include "df/viewscreen_layer.h" #include "df/viewscreen_layer_workshop_profilest.h" @@ -950,6 +951,9 @@ static df::building *getAnyBuilding(df::viewscreen *top) using df::global::world; using df::global::ui_sidebar_menus; + if (auto screen = strict_virtual_cast(top)) + return vector_get(screen->buildings, screen->cursor); + if (auto dfscreen = dfhack_viewscreen::try_cast(top)) return dfscreen->getSelectedBuilding(); diff --git a/library/xml b/library/xml index eb4af94c7..d52c7181f 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit eb4af94c7e737d99c194381749ac6743e146913e +Subproject commit d52c7181fb439a5fead143188d17d659d82e7f89