From fde1e284f4822491b3d07202585c59ac487a6e79 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 28 Dec 2017 16:19:45 -0500 Subject: [PATCH] Gui::getAnyItem: support viewscreen_assign_display_itemst --- library/modules/Gui.cpp | 10 ++++++++++ library/xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 0631e0ed7..d6eedcef7 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -74,6 +74,7 @@ using namespace DFHack; #include "df/ui_unit_view_mode.h" #include "df/unit.h" #include "df/unit_inventory_item.h" +#include "df/viewscreen_assign_display_itemst.h" #include "df/viewscreen_buildinglistst.h" #include "df/viewscreen_dungeon_monsterstatusst.h" #include "df/viewscreen_dungeonmodest.h" @@ -1042,6 +1043,15 @@ df::item *Gui::getAnyItem(df::viewscreen *top) return NULL; } + if (VIRTUAL_CAST_VAR(screen, df::viewscreen_assign_display_itemst, top)) + { + if (screen->sel_column == df::viewscreen_assign_display_itemst::T_sel_column::Items) + return vector_get(screen->items[screen->item_type[screen->sel_type]], + screen->sel_item); + + return NULL; + } + if (auto dfscreen = dfhack_viewscreen::try_cast(top)) return dfscreen->getSelectedItem(); diff --git a/library/xml b/library/xml index 301807985..1297be014 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 301807985eefb4db88416a0f5a7f7b94aadfb667 +Subproject commit 1297be0141c7116e677e19a9ddcad296ae31de7d