From c72ae8d8a77958cbe8bc9447ae0e14fff53b9f8b Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sun, 3 Dec 2017 20:05:08 -0600
Subject: [PATCH] Merge "announcements" global into d_init where it belongs

---
 library/modules/Gui.cpp | 8 ++++----
 library/xml             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 7de9a5e11..c3fad806f 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -48,12 +48,12 @@ using namespace DFHack;
 #include "DataDefs.h"
 
 #include "df/announcement_flags.h"
-#include "df/announcements.h"
 #include "df/assign_trade_status.h"
 #include "df/building_civzonest.h"
 #include "df/building_furnacest.h"
 #include "df/building_trapst.h"
 #include "df/building_workshopst.h"
+#include "df/d_init.h"
 #include "df/game_mode.h"
 #include "df/general_ref.h"
 #include "df/global_objects.h"
@@ -1428,13 +1428,13 @@ void Gui::showAutoAnnouncement(
     df::announcement_type type, df::coord pos, std::string message, int color, bool bright,
     df::unit *unit1, df::unit *unit2
 ) {
-    using df::global::announcements;
+    using df::global::d_init;
 
     df::announcement_flags flags;
     flags.bits.D_DISPLAY = flags.bits.A_DISPLAY = true;
 
-    if (is_valid_enum_item(type) && announcements)
-        flags = announcements->flags[type];
+    if (is_valid_enum_item(type) && d_init)
+        flags = d_init->announcements.flags[type];
 
     int id = makeAnnouncement(type, flags, pos, message, color, bright);
 
diff --git a/library/xml b/library/xml
index 3abfb36a1..9ffd5971b 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 3abfb36a129add730599cf27684b2c65ff7ba6bb
+Subproject commit 9ffd5971bd4709abec914715cee1a23963b7ee91