From 635e709d95d8ba583f251bdea3a1002f019cd178 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Fri, 6 Mar 2020 16:06:27 -0600
Subject: [PATCH] name ui_look_list union

update scripts and structures
---
 library/modules/Buildings.cpp |  2 +-
 library/modules/Gui.cpp       | 10 +++++-----
 library/xml                   |  2 +-
 plugins/search.cpp            | 12 ++++++------
 scripts                       |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 607f63a36..5219395c1 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -1162,7 +1162,7 @@ bool Buildings::deconstruct(df::building *bld)
     {
         auto item = ui_look_list->items[i];
         if (item->type == df::ui_look_list::T_items::Building &&
-            item->building == bld)
+            item->data.Building == bld)
         {
             vector_erase_at(ui_look_list->items, i);
             delete item;
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index b4c4a7693..3ba851438 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -1064,12 +1064,12 @@ df::unit *Gui::getAnyUnit(df::viewscreen *top)
         if (auto item = vector_get(ui_look_list->items, *ui_look_cursor))
         {
             if (item->type == df::ui_look_list::T_items::Unit)
-                return item->unit;
+                return item->data.Unit;
             else if (item->type == df::ui_look_list::T_items::Item)
             {
-                if (VIRTUAL_CAST_VAR(corpse, df::item_corpsest, item->item))
+                if (VIRTUAL_CAST_VAR(corpse, df::item_corpsest, item->data.Item))
                     return df::unit::find(corpse->unit_id); // loo(k) at corpse
-                else if (VIRTUAL_CAST_VAR(corpsepiece, df::item_corpsepiecest, item->item))
+                else if (VIRTUAL_CAST_VAR(corpsepiece, df::item_corpsepiecest, item->data.Item))
                     return df::unit::find(corpsepiece->unit_id); // loo(k) at corpse piece
             }
             else if (item->type == df::ui_look_list::T_items::Spatter)
@@ -1201,7 +1201,7 @@ df::item *Gui::getAnyItem(df::viewscreen *top)
 
         auto item = vector_get(ui_look_list->items, *ui_look_cursor);
         if (item && item->type == df::ui_look_list::T_items::Item)
-            return item->item;
+            return item->data.Item;
         else
             return NULL;
     }
@@ -1266,7 +1266,7 @@ df::building *Gui::getAnyBuilding(df::viewscreen *top)
 
         auto item = vector_get(ui_look_list->items, *ui_look_cursor);
         if (item && item->type == df::ui_look_list::T_items::Building)
-            return item->building;
+            return item->data.Building;
         else
             return NULL;
     }
diff --git a/library/xml b/library/xml
index 167d54bf7..23e66dc0d 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 167d54bf7c0e01a71ffb2de548701adc93da9dad
+Subproject commit 23e66dc0d44287a63fd918bbb81681510850c37d
diff --git a/plugins/search.cpp b/plugins/search.cpp
index 452e8cc23..43e14996a 100644
--- a/plugins/search.cpp
+++ b/plugins/search.cpp
@@ -1822,16 +1822,16 @@ public:
         switch (element->type)
         {
         case elt_type::Item:
-            if (element->item)
-                desc = Items::getDescription(element->item, 0, true);
+            if (element->data.Item)
+                desc = Items::getDescription(element->data.Item, 0, true);
             break;
         case elt_type::Unit:
-            if (element->unit)
-                desc = get_unit_description(element->unit);
+            if (element->data.Unit)
+                desc = get_unit_description(element->data.Unit);
             break;
         case elt_type::Building:
-            if (element->building)
-                element->building->getName(&desc);
+            if (element->data.Building)
+                element->data.Building->getName(&desc);
             break;
         default:
             break;
diff --git a/scripts b/scripts
index 7bab11642..f19655a4f 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 7bab11642bee7a3aa05d69332466f2ea5eaa1a2d
+Subproject commit f19655a4fc7cb89391cb484d04ba1dff81a11d6d