Merge pull request #692 from Bumber64/patch-4

Identify world.status.announcement_alert fields

df.announcements.xml

@@ -1217,6 +1217,15 @@
         <bool name='bright' init-value='true'/>
     </struct-type>
 
+    <struct-type type-name='announcement_alertst'>
+        <enum base-type='int32_t' type-name='announcement_alert_type' name='type'/>
+        <stl-vector name='announcement_id' type-name='int32_t'/>
+        <stl-vector name='report_unid' type-name='int32_t' comment='unit id'/>
+        <stl-vector name='report_unit_announcement_category'>
+            <enum type-name='unit_report_type'/>
+        </stl-vector>
+    </struct-type>
+
     <struct-type type-name='announcement_infost' comment='allocated on the stack, included in df-structures to assist with disassembly'>
         <enum base-type='int16_t' type-name='announcement_type' name='type'/>
         <int16_t name='color'/>

df.units.xml

@@ -385,7 +385,7 @@
                    comment='Seems to be used as default when not flags1.tame'/>
     </enum-type>
 
-    <enum-type type-name='unit_report_type' base-type='int16_t'>
+    <enum-type type-name='unit_report_type' base-type='int16_t' comment='(UnitAnnouncementCategory)'>
         <enum-item name='Combat'/>
         <enum-item name='Sparring'/>
         <enum-item name='Hunting'/>

df.world.xml

@@ -1069,8 +1069,8 @@
             <stl-vector name='mission_reports' pointer-type='mission_report'/>
             <stl-vector name='spoils_reports' pointer-type='spoils_report' since='v0.44.06'/>
             <stl-vector name='interrogation_reports' pointer-type='interrogation_report' since='v0.47.01'/>
-            <stl-vector name='announcement_alert'/>
-            <stl-vector name='alert_button_announcement_id'/>
+            <stl-vector name='announcement_alert' pointer-type='announcement_alertst'/>
+            <stl-vector name='alert_button_announcement_id' type-name='int32_t' comment='entries are report ids'/>
             <int32_t name='display_timer'/>
 
             <compound name='slots'>