Some tweaks to align globals better.

angavrilov · Dec 4, 2015 · 6dd5a16 · 6dd5a16
1 parent 3df992e
commit 6dd5a16
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 42 deletions.
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
@@ -223,9 +223,10 @@
             <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index'/>
             <int32_t name="mat_index"/>
             <compound name='material_category' type-name='job_material_category'/>
-        </compound>
 
-        <stl-string comment='v0.42.01'/>
+            <stl-string comment='v0.42.01'/>
+            <stl-vector name='use_tooltip_lines' pointer-type='stl-string' comment='v0.42.01'/>
+        </compound>
 
         <compound name='building'>
             <stl-vector name='choices_all' pointer-type='interface_button_constructionst'/>
@@ -276,35 +277,36 @@
             <int32_t name="unk_88"/>
             <int32_t name="unk_8c"/>
             <int32_t name="unk_90"/>
+        </compound>
 
-            judging from the destructor, these two sections should probably be in different compounds
+        <compound name='location'>
+            <stl-vector name='list' pointer-type='abstract_building' comment='v0.42.01'/>
+            <int32_t name='cursor' comment='v0.42.01'/>
 
-            <padding size="16" comment="v0.42.01"/>
+            <stl-vector name='deities' pointer-type='historical_figure' comment='v0.42.01'/>
+            <int32_t name='cursor_deity'/>
+
+            <bool name='in_create'/>
+            <bool name='in_choose_deity'/>
+        </compound>
 
+        <compound name='unit_cursor'>
             <stl-vector name='list' type-name='int32_t' refers-to='$global.world.units.active[$]'/>
 
             <int8_t name='unk_a0'/>
             <int8_t name='unk_a1'/>
+        </compound>
 
-            <stl-vector name='skills' type-name='int32_t' refers-to='$global.ui_selected_unit.index.refers-to.status.current_soul.skills[$]'/>
+        <compound name='unit_skills'>
+            <stl-vector name='skill_id' type-name='int32_t' refers-to='$global.ui_selected_unit.index.refers-to.status.current_soul.skills[$]'/>
+            <stl-vector name='skill_type' type-name='int32_t'/>
+            <stl-vector name='skill_subtype' type-name='int32_t'/>
 
             <bool name="show_combat"/>
             <bool name="show_labor"/>
             <bool name="show_misc"/>
         </compound>
 
-        <compound name='unk_v42_1'>
-            <int32_t/>
-            <stl-vector/>
-            <bool/>
-            <stl-vector/>
-            <stl-vector/>
-            <stl-vector/>
-            <bool/>
-            <bool/>
-            <bool/>
-        </compound>
-
         <compound name='barracks'>
             <int32_t name="squad_cursor"/>
 
@@ -324,6 +326,7 @@
         </compound>
 
         <stl-vector comment='v0.42.01'/>
+        <padding size='4' comment='v0.42.01'/>
 
         <compound name='minimap'>
             -- Abstract representation of contents; updated by need_scan

diff --git a/df.ui.xml b/df.ui.xml
@@ -259,6 +259,8 @@
                  comment='i.e. specifically the fortress dwarves'/>
         <int16_t name='race_id' ref-target='creature_raw'/>
 
+        <stl-vector type-name='int32_t' name='unk_races' ref-target='creature_raw' comment='v0.42.01'/>
+
         <stl-vector name='farm_crops' type-name='int16_t' ref-target='plant_raw'/>
         <stl-vector name='farm_seasons' type-name='int8_t'/>
 
@@ -294,6 +296,8 @@
                 <stl-vector type-name='int32_t' name='cheese_animal'/>
                 <stl-vector type-name='int32_t' name='cheese_plant'/>
                 <stl-vector type-name='int32_t' name='pets'/>
+                <stl-vector type-name='int32_t' comment='v0.42.01'/>
+                <stl-vector type-name='int32_t' comment='v0.42.01'/>
             </compound>
             <compound name='price_setter'>
                 <stl-vector name='general_items' index-enum='item_type' pointer-type='unit'/>
@@ -326,15 +330,11 @@
                 <stl-vector name='cheese_animal' pointer-type='unit'/>
                 <stl-vector name='cheese_plant' pointer-type='unit'/>
                 <stl-vector name='pets' pointer-type='unit'/>
+                <stl-vector comment='v0.42.01' pointer-type='unit'/>
+                <stl-vector comment='v0.42.01' pointer-type='unit'/>
             </compound>
         </compound>
 
-        <stl-vector comment='v0.42.01'/>
-        <stl-vector comment='v0.42.01'/>
-        <stl-vector comment='v0.42.01'/>
-        <stl-vector comment='v0.42.01'/>
-        <stl-vector comment='v0.42.01'/>
-
         <compound name='stockpile'>
             <int32_t name='reserved_bins'/>
             <int32_t name='reserved_barrels'/>
@@ -544,6 +544,8 @@
             <pointer name='fortress_entity' type-name='historical_entity'
                      comment='entity pointed to by group_id'/>
 
+            <pointer comment='v0.42.01'/>
+
             <enum base-type='int16_t' name='mode' type-name='ui_sidebar_mode'/>
 
             <int16_t name='unk1'/>
@@ -560,8 +562,6 @@
             <bool name='in_rename_hotkey'/>
         </compound>
 
-        <int32_t comment='v0.42.01'/>
-
         <compound name='squads'>
             <stl-vector name='list' has-bad-pointers='true'
                         comment='valid only when ui is displayed' pointer-type='squad'/>

diff --git a/v0.42.01.lst b/v0.42.01.lst
@@ -275,7 +275,7 @@
 "cultural_identity.unk_c.*.*" :STATUS :UNCHECKED
 "cumulus_type" :STATUS :UNCHECKED
 "curse_attr_change" :STATUS :UNCHECKED
-"d_init" :STATUS :UNCHECKED
+"d_init" :STATUS :ALIGNED
 "d_init_embark_confirm" :STATUS :UNCHECKED
 "d_init_flags1" :STATUS :UNCHECKED
 "d_init_flags2" :STATUS :UNCHECKED
@@ -301,7 +301,7 @@
 "embark_item_choice.list.*.*.*" :STATUS :UNCHECKED
 "embark_location" :STATUS :UNCHECKED
 "emotion_type" :STATUS :UNCHECKED
-"enabler" :STATUS :UNCHECKED
+"enabler" :STATUS :ALIGNED
 "enabler.async_frombox.queue.*" :STATUS :UNCHECKED
 "enabler.async_frombox.queue.*.msg" :STATUS :UNCHECKED
 "enabler.async_tobox.queue.*" :STATUS :UNCHECKED
@@ -457,7 +457,7 @@
 "gloves_flags" :STATUS :UNCHECKED
 "glowing_barrier" :STATUS :UNCHECKED
 "goal_type" :STATUS :UNCHECKED
-"graphic" :STATUS :UNCHECKED
+"graphic" :STATUS :ALIGNED
 "guild_id" :STATUS :UNCHECKED
 "hauler_type" :STATUS :UNCHECKED
 "hauling_route" :STATUS :UNCHECKED
@@ -637,17 +637,17 @@
 "improvement_type" :STATUS :UNCHECKED
 "incident" :STATUS :UNCHECKED
 "inclusion_type" :STATUS :UNCHECKED
-"init" :STATUS :UNCHECKED
-"init_display" :STATUS :UNCHECKED
+"init" :STATUS :VERIFIED
+"init_display" :STATUS :VERIFIED
 "init_display.windowed" :STATUS :UNCHECKED
 "init_display_flags" :STATUS :UNCHECKED
-"init_font" :STATUS :UNCHECKED
+"init_font" :STATUS :VERIFIED
 "init_font.use_ttf" :STATUS :UNCHECKED
-"init_input" :STATUS :UNCHECKED
+"init_input" :STATUS :VERIFIED
 "init_input_flags" :STATUS :UNCHECKED
-"init_media" :STATUS :UNCHECKED
+"init_media" :STATUS :VERIFIED
 "init_media_flags" :STATUS :UNCHECKED
-"init_window" :STATUS :UNCHECKED
+"init_window" :STATUS :VERIFIED
 "init_window_flags" :STATUS :UNCHECKED
 "inorganic_flags" :STATUS :UNCHECKED
 "inorganic_raw" :STATUS :UNCHECKED
@@ -695,7 +695,7 @@
 "interface_button_construction_donest" :STATUS :UNCHECKED
 "interface_button_constructionst" :STATUS :UNCHECKED
 "interface_key" :STATUS :UNCHECKED
-"interfacest" :STATUS :UNCHECKED
+"interfacest" :STATUS :ALIGNED
 "invasion_info" :STATUS :UNCHECKED
 "item" :STATUS :UNCHECKED
 "item_actual" :STATUS :UNCHECKED
@@ -876,7 +876,7 @@
 "map_block" :STATUS :UNCHECKED
 "map_block_column" :STATUS :UNCHECKED
 "map_block_column.unmined_glyphs.*.*" :STATUS :UNCHECKED
-"map_renderer" :STATUS :UNCHECKED
+"map_renderer" :STATUS :ALIGNED
 "map_renderer.@.*" :STATUS :UNCHECKED
 "map_viewport" :STATUS :UNCHECKED
 "masterpiece_loss_type" :STATUS :UNCHECKED
@@ -1076,7 +1076,8 @@
 "talk_choice" :STATUS :UNCHECKED
 "talk_choice_type" :STATUS :UNCHECKED
 "temperaturest" :STATUS :UNCHECKED
-"texture_handler" :STATUS :UNCHECKED
+"texture_handler" :STATUS :VERIFIED
+"texture_handler.page" :STATUS :VERIFIED
 "tile_bitmask" :STATUS :UNCHECKED
 "tile_building_occ" :STATUS :UNCHECKED
 "tile_designation" :STATUS :UNCHECKED
@@ -1108,8 +1109,9 @@
 "trap_type" :STATUS :UNCHECKED
 "trapcomp_flags" :STATUS :UNCHECKED
 "tree_house_type" :STATUS :UNCHECKED
-"ui" :STATUS :UNCHECKED
+"ui" :STATUS :ALIGNED
 "ui.alerts.list.*.*" :STATUS :UNCHECKED
+"ui.economy_prices" :STATUS :UNCHECKED
 "ui.main.dead_citizens.*.*" :STATUS :UNCHECKED
 "ui.unk2a8c.*.*" :STATUS :UNCHECKED
 "ui.waypoints.points.*.*" :STATUS :UNCHECKED
@@ -1122,13 +1124,13 @@
 "ui_advmode.unk_v40_4.unk_v40_4a.*" :STATUS :UNCHECKED
 "ui_advmode_menu" :STATUS :UNCHECKED
 "ui_build_item_req" :STATUS :UNCHECKED
-"ui_build_selector" :STATUS :UNCHECKED
+"ui_build_selector" :STATUS :ALIGNED
 "ui_hotkey" :STATUS :UNCHECKED
 "ui_hotkey.cmd" :STATUS :UNCHECKED
-"ui_look_list" :STATUS :UNCHECKED
+"ui_look_list" :STATUS :ALIGNED
 "ui_look_list.items.*.*" :STATUS :UNCHECKED
 "ui_look_list.items.*.*.type" :STATUS :UNCHECKED
-"ui_sidebar_menus" :STATUS :UNCHECKED
+"ui_sidebar_menus" :STATUS :ALIGNED
 "ui_sidebar_menus.designation.mine_mode" :STATUS :UNCHECKED
 "ui_sidebar_menus.zone.mode" :STATUS :UNCHECKED
 "ui_sidebar_mode" :STATUS :UNCHECKED
@@ -1306,7 +1308,7 @@
 "widget_textbox" :STATUS :UNCHECKED
 "workshop_profile" :STATUS :UNCHECKED
 "workshop_type" :STATUS :UNCHECKED
-"world" :STATUS :UNCHECKED
+"world" :STATUS :ALIGNED
 "world.@.*" :STATUS :UNCHECKED
 "world.arena_spawn.item_types.*.*.*" :STATUS :UNCHECKED
 "world.job_postings.*.*" :STATUS :UNCHECKED