From 666f4c7f5fc578240d2a2ab2aa097bfc5c60d6ad Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 26 Dec 2016 19:36:55 -0500
Subject: [PATCH] Change bitfield <compound>s to <bitfield>s

Closes dfhack/df-structures#173
See DFHack/dfhack#1047
---
 df.art.xml              |  2 +-
 df.building-raws.xml    |  6 +++---
 df.buildings.xml        | 24 ++++++++++++------------
 df.entities.xml         |  4 ++--
 df.history.xml          |  2 +-
 df.interaction.xml      |  2 +-
 df.itemimprovements.xml |  2 +-
 df.items.xml            | 14 +++++++-------
 df.jobs.xml             | 34 +++++++++++++++++-----------------
 df.knowledge.xml        | 28 ++++++++++++++--------------
 df.language.xml         |  2 +-
 df.machines.xml         |  2 +-
 df.map.xml              | 12 ++++++------
 df.military.xml         |  6 +++---
 df.plants.xml           |  2 +-
 df.projectile.xml       |  2 +-
 df.reaction-raws.xml    |  8 ++++----
 df.stockpile.xml        |  2 +-
 df.syndrome.xml         | 12 ++++++------
 df.ui-menus.xml         | 10 +++++-----
 df.units.xml            | 34 +++++++++++++++++-----------------
 df.vermin.xml           |  2 +-
 df.viewscreen.xml       |  8 ++++----
 df.world-site.xml       |  2 +-
 24 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/df.art.xml b/df.art.xml
index 4ef3048c6..6a2062ed0 100644
--- a/df.art.xml
+++ b/df.art.xml
@@ -68,7 +68,7 @@
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int16_t name='mat_index'/>
-        <compound name='flags' type-name='item_flags'/>
+        <bitfield name='flags' type-name='item_flags'/>
         <int32_t name='item_id' ref-target='item'/>
     </class-type>
 
diff --git a/df.building-raws.xml b/df.building-raws.xml
index ebb305620..b2fdbb033 100644
--- a/df.building-raws.xml
+++ b/df.building-raws.xml
@@ -69,9 +69,9 @@
         <stl-string name='reaction_class'/>
         <stl-string name='has_material_reaction_product'/>
 
-        <compound name='flags1' type-name='job_item_flags1'/>
-        <compound name='flags2' type-name='job_item_flags2'/>
-        <compound name='flags3' type-name='job_item_flags3'/>
+        <bitfield name='flags1' type-name='job_item_flags1'/>
+        <bitfield name='flags2' type-name='job_item_flags2'/>
+        <bitfield name='flags3' type-name='job_item_flags3'/>
         <uint32_t name='flags4'/>
         <uint32_t name='flags5'/>
 
diff --git a/df.buildings.xml b/df.buildings.xml
index d22ee22e6..d7e99734a 100644
--- a/df.buildings.xml
+++ b/df.buildings.xml
@@ -234,7 +234,7 @@
         <int32_t name='centery'/>
         <int32_t name='z'/>
 
-        <compound name='flags' type-name='building_flags'/>
+        <bitfield name='flags' type-name='building_flags'/>
 
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' init-value='-1'/>
@@ -785,12 +785,12 @@
     </class-type>
 
     <class-type type-name='building_bars_verticalst' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
     </class-type>
 
     <class-type type-name='building_bars_floorst' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
     </class-type>
 
@@ -820,7 +820,7 @@
     </class-type>
 
     <class-type type-name='building_bridgest' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
         <enum name='direction' base-type='int8_t'>
             <enum-item name='Retracting' value='-1'/>
@@ -915,7 +915,7 @@
     </class-type>
 
     <class-type type-name='building_doorst' inherits-from='building_actual'>
-        <compound name='door_flags' type-name='door_flags' init-value='0x50'/>
+        <bitfield name='door_flags' type-name='door_flags' init-value='0x50'/>
         <int16_t name='close_timer'/>
     </class-type>
 
@@ -932,22 +932,22 @@
     </class-type>
 
     <class-type type-name='building_floodgatest' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
     </class-type>
 
     <class-type type-name='building_grate_floorst' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
     </class-type>
 
     <class-type type-name='building_grate_wallst' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
     </class-type>
 
     <class-type type-name='building_hatchst' inherits-from='building_actual'>
-        <compound name='door_flags' type-name='door_flags' init-value='0x50'/>
+        <bitfield name='door_flags' type-name='door_flags' init-value='0x50'/>
         <int16_t name='close_timer'/>
     </class-type>
 
@@ -958,7 +958,7 @@
     </bitfield-type>
 
     <class-type type-name='building_hivest' inherits-from='building_actual'>
-        <compound name='hive_flags' type-name='hive_flags'/>
+        <bitfield name='hive_flags' type-name='hive_flags'/>
         <int32_t name='split_timer' comment='up to 100800'/>
         <int32_t name='activity_timer' comment='up to 100800000; checks timer%hive_product.time[i]==0'/>
         <int32_t name='install_timer' comment='down from 1200'/>
@@ -1115,13 +1115,13 @@
     <class-type type-name='building_wagonst' inherits-from='building_actual'/>
 
     <class-type type-name='building_weaponst' inherits-from='building_actual'>
-        <compound name='gate_flags' type-name='gate_flags' init-value='1'/>
+        <bitfield name='gate_flags' type-name='gate_flags' init-value='1'/>
         <int8_t name='timer'/>
     </class-type>
 
     <struct-type type-name='building_squad_use'>
         <int32_t name='squad_id' ref-target='squad'/>
-        <compound name='mode' type-name='squad_use_flags'/>
+        <bitfield name='mode' type-name='squad_use_flags'/>
     </struct-type>
 
     <class-type type-name='building_weaponrackst' inherits-from='building_actual'>
diff --git a/df.entities.xml b/df.entities.xml
index b274cc661..1869185f9 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -951,7 +951,7 @@
         <int16_t name='image_thread_color' ref-target='descriptor_color'/>
         <enum base-type='int16_t' name='image_material_class' type-name='entity_material_category'/>
         <int16_t name='maker_race'/>
-        <compound name="indiv_choice" type-name='uniform_indiv_choice'/>
+        <bitfield name="indiv_choice" type-name='uniform_indiv_choice'/>
         <int16_t name="mattype" ref-target='material' aux-value='$$.matindex'/>
         <int32_t name="matindex"/>
         <enum base-type='int16_t' name="material_class" type-name='entity_material_category'/>
@@ -983,7 +983,7 @@
 
         <stl-string name="name"/>
 
-        <compound name='flags' type-name='uniform_flags'/>
+        <bitfield name='flags' type-name='uniform_flags'/>
     </struct-type>
 
     <enum-type type-name='entity_event_type'>
diff --git a/df.history.xml b/df.history.xml
index bf6dde8c2..848e6d3b9 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -312,7 +312,7 @@
 
         <int8_t name='sex' comment='-1 n/a, 0 female, 1 male'/>
 
-        <compound type-name='orientation_flags' name='orientation_flags'/>
+        <bitfield type-name='orientation_flags' name='orientation_flags'/>
         <int32_t name='appeared_year'/>
         <int32_t name='born_year'/>
         <int32_t name='born_seconds'/>
diff --git a/df.interaction.xml b/df.interaction.xml
index be4f3f965..e735f1e2e 100644
--- a/df.interaction.xml
+++ b/df.interaction.xml
@@ -81,7 +81,7 @@
 
     <class-type type-name='interaction_effect_cleanst' inherits-from='interaction_effect'>
         <int32_t name='grime_level'/>
-        <compound name='syndrome_tag' type-name='syndrome_flags'/>
+        <bitfield name='syndrome_tag' type-name='syndrome_flags'/>
         <int32_t/>
     </class-type>
 
diff --git a/df.itemimprovements.xml b/df.itemimprovements.xml
index ec4e38c2d..1d7728695 100644
--- a/df.itemimprovements.xml
+++ b/df.itemimprovements.xml
@@ -213,7 +213,7 @@
         <enum base-type='int32_t' name="skill_rating" type-name='skill_rating'
               comment='at the moment of creation'/>
         <compound name='pos' type-name='coord'/>
-        <compound name='flags' type-name='engraving_flags'/>
+        <bitfield name='flags' type-name='engraving_flags'/>
         <int8_t name='tile'/>
         <int32_t name='art_id' ref-target='art_image_chunk'/>
         <int16_t name='art_subid' ref-target='art_image' aux-value='$$.art_id'/>
diff --git a/df.items.xml b/df.items.xml
index 72fa722e2..14357e042 100644
--- a/df.items.xml
+++ b/df.items.xml
@@ -141,8 +141,8 @@
                 instance-vector='$global.world.items.all' key-field='id'>
         <compound name='pos' type-name='coord'/>
 
-        <compound name='flags' type-name='item_flags'/>
-        <compound name='flags2' type-name='item_flags2' since='v0.34.08'/>
+        <bitfield name='flags' type-name='item_flags'/>
+        <bitfield name='flags2' type-name='item_flags2' since='v0.34.08'/>
 
         <uint32_t name='age'/>
         <int32_t name='id'/>
@@ -919,7 +919,7 @@
 
     <class-type type-name='item_liquipowder' inherits-from='item_actual'
                 original-name='item_liquipowderst'>
-        <compound name='mat_state' type-name='item_matstate'/>
+        <bitfield name='mat_state' type-name='item_matstate'/>
         <int32_t name='dimension' init-value='150'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
@@ -1009,7 +1009,7 @@
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
         <int32_t name='rot_timer'/>
-        <compound name='mat_state' type-name='item_matstate'/>
+        <bitfield name='mat_state' type-name='item_matstate'/>
         <int32_t/>
     </class-type>
     <class-type type-name='item_remainsst' inherits-from='item_actual'>
@@ -1107,11 +1107,11 @@
                  comment='-1 if no father genes'/>
         <int32_t since='v0.40.01'/>
 
-        <compound name='hatchling_flags1' type-name='unit_flags1'
+        <bitfield name='hatchling_flags1' type-name='unit_flags1'
                   comment='used primarily for bit_flag:tame'/>
-        <compound name='hatchling_flags2' type-name='unit_flags2'
+        <bitfield name='hatchling_flags2' type-name='unit_flags2'
                   comment='used primarily for bit_flag:roaming_wilderness_population_source'/>
-        <compound name='hatchling_flags3' type-name='unit_flags3'
+        <bitfield name='hatchling_flags3' type-name='unit_flags3'
                   comment='not normally used, most/all do not stick'/>
 
         <int32_t name='unk_v42_1' since='v0.42.01'/>
diff --git a/df.jobs.xml b/df.jobs.xml
index 8d5ee9157..bdc44f045 100644
--- a/df.jobs.xml
+++ b/df.jobs.xml
@@ -105,7 +105,7 @@
 
         <uint32_t name='unk4' comment='garbage, but serialized'/>
 
-        <compound name='flags' type-name='job_flags'/>
+        <bitfield name='flags' type-name='job_flags'/>
 
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' init-value='-1'/>
@@ -114,9 +114,9 @@
         <int16_t name='item_subtype' init-value='-1' comment='for StoreInStockpile: hauler_type'/>
 
         -- For building construction, bit 0 marks if location was updated:
-        <compound name="item_category" type-name='stockpile_group_set'/>
+        <bitfield name="item_category" type-name='stockpile_group_set'/>
         <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-        <compound name='material_category' type-name='job_material_category'/>
+        <bitfield name='material_category' type-name='job_material_category'/>
 
         <stl-string name='reaction_name'/>
 
@@ -256,14 +256,14 @@
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' init-value='-1'/>
 
-        <compound name='flags1' type-name='job_item_flags1'/>
+        <bitfield name='flags1' type-name='job_item_flags1'/>
 
         <int32_t name='quantity' init-value='1'/>
         <enum base-type='int16_t' name='vector_id'
               type-name='job_item_vector_id' init-value='IN_PLAY'/>
 
-        <compound name='flags2' type-name='job_item_flags2'/>
-        <compound name='flags3' type-name='job_item_flags3'/>
+        <bitfield name='flags2' type-name='job_item_flags2'/>
+        <bitfield name='flags3' type-name='job_item_flags3'/>
         <uint32_t name='flags4'/>
         <uint32_t name='flags5'/>
 
@@ -291,7 +291,7 @@
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' init-value='-1'/>
 
-        <compound name="flags1" type-name='job_item_flags1'/>
+        <bitfield name="flags1" type-name='job_item_flags1'/>
 
         <pointer name="item_vector">
             <stl-vector pointer-type='item'/>
@@ -299,10 +299,10 @@
 
         <bool name="use_mat_index"/>
 
-        <compound name="flags2" type-name='job_item_flags2'/>
+        <bitfield name="flags2" type-name='job_item_flags2'/>
         <bool name="use_flags2"/>
 
-        <compound name="flags3" type-name='job_item_flags3'/>
+        <bitfield name="flags3" type-name='job_item_flags3'/>
         <bool name="use_flags3"/>
 
         <uint32_t name='flags4'/>
@@ -395,15 +395,15 @@
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index' init-value='-1'/>
         <int32_t name="mat_index" init-value='-1'/>
 
-        <compound name="item_category" type-name='stockpile_group_set'/>
+        <bitfield name="item_category" type-name='stockpile_group_set'/>
         <int32_t name="hist_figure_id" ref-target='historical_figure' init-value='-1'/>
-        <compound name="material_category" type-name='job_material_category'/>
+        <bitfield name="material_category" type-name='job_material_category'/>
 
         <compound name='art_spec' type-name='job_art_specification'/>
 
         <int16_t name="amount_left" />
         <int16_t name="amount_total" />
-        <compound name="status" type-name='manager_order_status'/>
+        <bitfield name="status" type-name='manager_order_status'/>
         <enum base-type='int32_t' name="frequency">
             <enum-item name='OneTime'/>
             <enum-item name='Daily'/>
@@ -434,9 +434,9 @@
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)' init-value='-1'/>
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index' init-value='-1'/>
         <int32_t name="mat_index" init-value='-1'/>
-        <compound name='flags1' type-name='job_item_flags1'/>
-        <compound name='flags2' type-name='job_item_flags2'/>
-        <compound name='flags3' type-name='job_item_flags3'/>
+        <bitfield name='flags1' type-name='job_item_flags1'/>
+        <bitfield name='flags2' type-name='job_item_flags2'/>
+        <bitfield name='flags3' type-name='job_item_flags3'/>
         <uint32_t name='flags4'/>
         <uint32_t name='flags5'/>
         <stl-string name='reaction_class'/>
@@ -464,9 +464,9 @@
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name="mat_index"/>
-        <compound name="item_category" type-name='stockpile_group_set'/>
+        <bitfield name="item_category" type-name='stockpile_group_set'/>
         <int32_t name="hist_figure_id" ref-target='historical_figure' init-value='-1'/>
-        <compound name="material_category" type-name='job_material_category'/>
+        <bitfield name="material_category" type-name='job_material_category'/>
         <int8_t init-value='1'/>
     </struct-type>
 
diff --git a/df.knowledge.xml b/df.knowledge.xml
index be66c3014..142a31794 100644
--- a/df.knowledge.xml
+++ b/df.knowledge.xml
@@ -392,20 +392,20 @@
         <!-- the compound below does not work because bitfields have constructors -->
 <!--
         <compound name='flags' is-union='true'>
-            <compound name='flags_0' type-name='knowledge_scholar_flags_0'/>
-            <compound name='flags_1' type-name='knowledge_scholar_flags_1'/>
-            <compound name='flags_2' type-name='knowledge_scholar_flags_2'/>
-            <compound name='flags_3' type-name='knowledge_scholar_flags_3'/>
-            <compound name='flags_4' type-name='knowledge_scholar_flags_4'/>
-            <compound name='flags_5' type-name='knowledge_scholar_flags_5'/>
-            <compound name='flags_6' type-name='knowledge_scholar_flags_6'/>
-            <compound name='flags_7' type-name='knowledge_scholar_flags_7'/>
-            <compound name='flags_8' type-name='knowledge_scholar_flags_8'/>
-            <compound name='flags_9' type-name='knowledge_scholar_flags_9'/>
-            <compound name='flags_10' type-name='knowledge_scholar_flags_10'/>
-            <compound name='flags_11' type-name='knowledge_scholar_flags_11'/>
-            <compound name='flags_12' type-name='knowledge_scholar_flags_12'/>
-            <compound name='flags_13' type-name='knowledge_scholar_flags_13'/>
+            <bitfield name='flags_0' type-name='knowledge_scholar_flags_0'/>
+            <bitfield name='flags_1' type-name='knowledge_scholar_flags_1'/>
+            <bitfield name='flags_2' type-name='knowledge_scholar_flags_2'/>
+            <bitfield name='flags_3' type-name='knowledge_scholar_flags_3'/>
+            <bitfield name='flags_4' type-name='knowledge_scholar_flags_4'/>
+            <bitfield name='flags_5' type-name='knowledge_scholar_flags_5'/>
+            <bitfield name='flags_6' type-name='knowledge_scholar_flags_6'/>
+            <bitfield name='flags_7' type-name='knowledge_scholar_flags_7'/>
+            <bitfield name='flags_8' type-name='knowledge_scholar_flags_8'/>
+            <bitfield name='flags_9' type-name='knowledge_scholar_flags_9'/>
+            <bitfield name='flags_10' type-name='knowledge_scholar_flags_10'/>
+            <bitfield name='flags_11' type-name='knowledge_scholar_flags_11'/>
+            <bitfield name='flags_12' type-name='knowledge_scholar_flags_12'/>
+            <bitfield name='flags_13' type-name='knowledge_scholar_flags_13'/>
         </compound>
 -->
     </struct-type>
diff --git a/df.language.xml b/df.language.xml
index ece6f80fb..1bea2f2db 100644
--- a/df.language.xml
+++ b/df.language.xml
@@ -175,7 +175,7 @@
 
         <padding size='7' comment='looks like garbage'/>
 
-        <compound name='flags' type-name='language_word_flags'/>
+        <bitfield name='flags' type-name='language_word_flags'/>
 
         <stl-vector pointer-type='stl-string' name='str' since='v0.40.01'/>
     </struct-type>
diff --git a/df.machines.xml b/df.machines.xml
index c938415b9..822d34448 100644
--- a/df.machines.xml
+++ b/df.machines.xml
@@ -29,7 +29,7 @@
     <struct-type type-name='machine_tile_set'>
         <compound name='tiles' type-name='coord_path'/>
         <stl-vector name='can_connect'>
-            <compound type-name='machine_conn_modes'/>
+            <bitfield type-name='machine_conn_modes'/>
         </stl-vector>
     </struct-type>
 
diff --git a/df.map.xml b/df.map.xml
index 795836476..6dd340ff6 100644
--- a/df.map.xml
+++ b/df.map.xml
@@ -227,7 +227,7 @@
     </struct-type>
 
     <struct-type type-name='map_block'>
-        <compound name='flags' type-name='block_flags'/>
+        <bitfield name='flags' type-name='block_flags'/>
 
         <stl-vector name='block_events' pointer-type='block_square_event'/>
 
@@ -242,7 +242,7 @@
         <int16_t name='layer_depth' comment='uninitialized'/>
 
         <int32_t name='dsgn_check_cooldown'/>
-        <compound type-name='tile_designation' name='default_liquid'/>
+        <bitfield type-name='tile_designation' name='default_liquid'/>
 
         <stl-vector name='items'>
             <int32_t ref-target='item'/>
@@ -263,12 +263,12 @@
         </static-array>
         <static-array name='designation' count='16'>
             <static-array count='16'>
-                <compound type-name='tile_designation'/>
+                <bitfield type-name='tile_designation'/>
             </static-array>
         </static-array>
         <static-array name='occupancy' count='16'>
             <static-array count='16'>
-                <compound type-name='tile_occupancy'/>
+                <bitfield type-name='tile_occupancy'/>
             </static-array>
         </static-array>
 
@@ -319,7 +319,7 @@
         </static-array>
         <static-array name='liquid_flow' count='16'>
             <static-array count='16'>
-                <compound type-name='tile_liquid_flow'/>
+                <bitfield type-name='tile_liquid_flow'/>
             </static-array>
         </static-array>
 
@@ -883,7 +883,7 @@
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <compound type-name='construction_flags' name='flags'/>
+        <bitfield type-name='construction_flags' name='flags'/>
         <enum base-type='int16_t' type-name='tiletype' name='original_tile'/>
     </struct-type>
 
diff --git a/df.military.xml b/df.military.xml
index 8380b2563..8af4cd061 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -26,7 +26,7 @@
             <int32_t ref-target='item'/>
         </stl-vector>
 
-        <compound name="indiv_choice" type-name='uniform_indiv_choice'/>
+        <bitfield name="indiv_choice" type-name='uniform_indiv_choice'/>
     </struct-type>
 
     <struct-type type-name='squad_ammo_spec'>
@@ -97,7 +97,7 @@
 
         <stl-string name="unk_c4"/>
 
-        <compound name='flags' type-name='uniform_flags'/>
+        <bitfield name='flags' type-name='uniform_flags'/>
 
         <stl-vector name='assigned_items'>
             <int32_t ref-target='item'/>
@@ -166,7 +166,7 @@
         <stl-vector name="rooms">
             <pointer>
                 <int32_t name='building_id' ref-target='building'/>
-                <compound name='mode' type-name='squad_use_flags'/>
+                <bitfield name='mode' type-name='squad_use_flags'/>
             </pointer>
         </stl-vector>
 
diff --git a/df.plants.xml b/df.plants.xml
index d74970595..6645c73b4 100644
--- a/df.plants.xml
+++ b/df.plants.xml
@@ -5,7 +5,7 @@
     </bitfield-type>
 
     <struct-type type-name='plant' instance-vector='$global.world.plants.all'>
-        <compound type-name='plant_flags' name='flags'/>
+        <bitfield type-name='plant_flags' name='flags'/>
         <int16_t name='material' ref-target='plant_raw'/>
         <compound name='pos' type-name='coord'/>
 
diff --git a/df.projectile.xml b/df.projectile.xml
index ccdffd453..5d88559ea 100644
--- a/df.projectile.xml
+++ b/df.projectile.xml
@@ -45,7 +45,7 @@
         <int32_t name='min_hit_distance'/>
         <int32_t name='min_ground_distance'/>
 
-        <compound name='flags' type-name='projectile_flags'/>
+        <bitfield name='flags' type-name='projectile_flags'/>
 
         <int16_t name='fall_counter' comment='counts down from delay to 0, then it moves'/>
         <int16_t name='fall_delay'/>
diff --git a/df.reaction-raws.xml b/df.reaction-raws.xml
index 3f12be295..ffd3b46a2 100644
--- a/df.reaction-raws.xml
+++ b/df.reaction-raws.xml
@@ -66,7 +66,7 @@
 
         <int32_t name='quantity'/>
 
-        <compound name="flags" type-name='reaction_reagent_flags'/>
+        <bitfield name="flags" type-name='reaction_reagent_flags'/>
 
         <virtual-methods>
             <vmethod ret-type='reaction_reagent_type' name='getType'/>
@@ -109,9 +109,9 @@
         <stl-string name='reaction_class'/>
         <stl-string name='has_material_reaction_product'/>
 
-        <compound name='flags1' type-name='job_item_flags1'/>
-        <compound name='flags2' type-name='job_item_flags2'/>
-        <compound name='flags3' type-name='job_item_flags3'/>
+        <bitfield name='flags1' type-name='job_item_flags1'/>
+        <bitfield name='flags2' type-name='job_item_flags2'/>
+        <bitfield name='flags3' type-name='job_item_flags3'/>
         <uint32_t name='flags4'/>
         <uint32_t name='flags5'/>
 
diff --git a/df.stockpile.xml b/df.stockpile.xml
index 6a205caf1..a8cb3bf37 100644
--- a/df.stockpile.xml
+++ b/df.stockpile.xml
@@ -98,7 +98,7 @@
     </bitfield-type>
 
     <struct-type type-name='stockpile_settings'>
-        <compound name='flags' type-name='stockpile_group_set'/>
+        <bitfield name='flags' type-name='stockpile_group_set'/>
 
         <compound name='animals'>
             <bool name='empty_cages'/>
diff --git a/df.syndrome.xml b/df.syndrome.xml
index 95fc242b9..49fe57fbc 100644
--- a/df.syndrome.xml
+++ b/df.syndrome.xml
@@ -113,7 +113,7 @@
 
     <class-type type-name='creature_interaction_effect' original-name='creature_interaction_effectst'
                 instance-vector='$global.world.raws.effects.all'>
-        <compound name='flags' type-name='creature_interaction_effect_flags'/>
+        <bitfield name='flags' type-name='creature_interaction_effect_flags'/>
         <int32_t name='prob'/>
         <int32_t name='start'/>
         <int32_t name='peak'/>
@@ -335,14 +335,14 @@
 
     <class-type type-name='creature_interaction_effect_add_simple_flagst'
                 inherits-from='creature_interaction_effect'>
-        <compound name='tags1' type-name='cie_add_tag_mask1'/>
-        <compound name='tags2' type-name='cie_add_tag_mask2'/>
+        <bitfield name='tags1' type-name='cie_add_tag_mask1'/>
+        <bitfield name='tags2' type-name='cie_add_tag_mask2'/>
     </class-type>
 
     <class-type type-name='creature_interaction_effect_remove_simple_flagst'
                 inherits-from='creature_interaction_effect'>
-        <compound name='tags1' type-name='cie_add_tag_mask1'/>
-        <compound name='tags2' type-name='cie_add_tag_mask2'/>
+        <bitfield name='tags1' type-name='cie_add_tag_mask1'/>
+        <bitfield name='tags2' type-name='cie_add_tag_mask2'/>
     </class-type>
 
     <class-type type-name='creature_interaction_effect_speed_changest'
@@ -459,7 +459,7 @@
 
         <stl-string name='unk_v42_1' since='v0.42.01'/>
 
-        <compound name='flags' type-name='syndrome_flags'/>
+        <bitfield name='flags' type-name='syndrome_flags'/>
 
         <int32_t name='unk_v42_2' since='v0.42.01'/>
         <int32_t name='unk_v42_3' since='v0.42.01'/>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index c787086cd..0c735af99 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -166,7 +166,7 @@
                 inherits-from='interface_button_buildingst'>
         <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'/>
+        <bitfield name='material_category' type-name='job_material_category'/>
         <int8_t name="unk_1c"/>
     </class-type>
 
@@ -178,9 +178,9 @@
         <int16_t name="item_subtype"/>
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index'/>
-        <compound name="item_category" type-name='stockpile_group_set'/>
+        <bitfield name="item_category" type-name='stockpile_group_set'/>
         <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-        <compound name='material_category' type-name='job_material_category'/>
+        <bitfield name='material_category' type-name='job_material_category'/>
         <bool name="unk_48"/>
         <bool name="is_custom"/>
     </class-type>
@@ -239,7 +239,7 @@
 
             <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'/>
+            <bitfield name='material_category' type-name='job_material_category'/>
 
             <stl-string since='v0.42.01'/>
             <stl-vector name='use_tooltip_lines' pointer-type='stl-string' since='v0.42.01'/>
@@ -361,7 +361,7 @@
 
             <stl-vector name='squads' pointer-type='squad'/>
             <stl-vector name='uses'>
-                <compound type-name='squad_use_flags'/>
+                <bitfield type-name='squad_use_flags'/>
             </stl-vector>
 
             <bool name="in_rename"/>
diff --git a/df.units.xml b/df.units.xml
index 16cb24a8a..c0edc867b 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -534,10 +534,10 @@
             <compound name='path' type-name='coord_path'/>
         </compound>
 
-        <compound name='flags1' type-name='unit_flags1'/>
-        <compound name='flags2' type-name='unit_flags2'/>
-        <compound name='flags3' type-name='unit_flags3'/>
-        <compound name='flags4' type-name='unit_flags4'/>
+        <bitfield name='flags1' type-name='unit_flags1'/>
+        <bitfield name='flags2' type-name='unit_flags2'/>
+        <bitfield name='flags3' type-name='unit_flags3'/>
+        <bitfield name='flags4' type-name='unit_flags4'/>
 
         <compound name='meeting'>
             <enum name='state' base-type='int8_t'>
@@ -785,10 +785,10 @@
         <compound name='curse'>
             <int32_t name='unk_0' comment='moved from end of counters in 0.43.05'/>
 
-            <compound name='add_tags1' type-name='cie_add_tag_mask1'/>
-            <compound name='rem_tags1' type-name='cie_add_tag_mask1'/>
-            <compound name='add_tags2' type-name='cie_add_tag_mask2'/>
-            <compound name='rem_tags2' type-name='cie_add_tag_mask2'/>
+            <bitfield name='add_tags1' type-name='cie_add_tag_mask1'/>
+            <bitfield name='rem_tags1' type-name='cie_add_tag_mask1'/>
+            <bitfield name='add_tags2' type-name='cie_add_tag_mask2'/>
+            <bitfield name='rem_tags2' type-name='cie_add_tag_mask2'/>
 
             <bool name='name_visible' since='v0.34.01'/>
             <stl-string name='name' since='v0.34.01'/>
@@ -913,7 +913,7 @@
 
             <uint32_t name='add_path_flags' comment='pathing flags to OR, set to 0 after move'/>
 
-            <compound type-name='tile_designation' name='liquid_type'/>
+            <bitfield type-name='tile_designation' name='liquid_type'/>
             <uint8_t name='liquid_depth'/>
 
             <int32_t name='unk_7c0' init-value='-1'/>
@@ -1286,8 +1286,8 @@
                 Values above 50 turn straight_scar description into curving scar.
                 <int16_t name="edged_curve_perc"/>
 
-                <compound name="flags1" type-name='wound_damage_flags1'/>
-                <compound name="flags2" type-name='wound_damage_flags2'/>
+                <bitfield name="flags1" type-name='wound_damage_flags1'/>
+                <bitfield name="flags2" type-name='wound_damage_flags2'/>
 
                 <int32_t name="bleeding"/>
                 <int32_t name="pain"/>
@@ -1359,10 +1359,10 @@
     <struct-type type-name='wound_curse_info'>
         <int32_t name='unk_v40_1' since='v0.40.01'/>
 
-        <compound name='add_tags1' type-name='cie_add_tag_mask1'/>
-        <compound name='rem_tags1' type-name='cie_add_tag_mask1'/>
-        <compound name='add_tags2' type-name='cie_add_tag_mask2'/>
-        <compound name='rem_tags2' type-name='cie_add_tag_mask2'/>
+        <bitfield name='add_tags1' type-name='cie_add_tag_mask1'/>
+        <bitfield name='rem_tags1' type-name='cie_add_tag_mask1'/>
+        <bitfield name='add_tags2' type-name='cie_add_tag_mask2'/>
+        <bitfield name='rem_tags2' type-name='cie_add_tag_mask2'/>
 
         <bool name='name_visible'/>
         <stl-string name='name'/>
@@ -1553,7 +1553,7 @@
     <struct-type type-name='unit_health_info'>
         <int32_t name="unit_id" ref-target='unit'/>
 
-        <compound name="flags" type-name='unit_health_flags'/>
+        <bitfield name="flags" type-name='unit_health_flags'/>
         <stl-vector name="body_part_flags" type-name='unit_bp_health_flags'/>
 
         <int16_t name="unk_18_cntdn"/>
@@ -1619,7 +1619,7 @@
             (fmt "~:(~A ~A~)" $it.caste[$.caste].caste_id $it.creature_id))
         </code-helper>
 
-        <compound type-name='orientation_flags' name='orientation_flags'/>
+        <bitfield type-name='orientation_flags' name='orientation_flags'/>
         <int32_t name='unk2'/>
         <int32_t name='unk3'/>
         <int32_t name='unk4'/>
diff --git a/df.vermin.xml b/df.vermin.xml
index e398a08f6..f04f63184 100644
--- a/df.vermin.xml
+++ b/df.vermin.xml
@@ -17,7 +17,7 @@
 
         <pointer name="item" type-name='item'/>
 
-        <compound name='flags' type-name='vermin_flags'/>
+        <bitfield name='flags' type-name='vermin_flags'/>
         <int32_t name="amount" comment="The total number of vermin in this object. Decimal constant 10000001 means infinity (probably)." />
 
         <compound name='population' type-name='world_population_ref'/>
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index b90bccdea..abd80decd 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -1159,13 +1159,13 @@
 
         <stl-vector name="unit" pointer-type='unit'/>
         <stl-vector name="bits1">
-            <compound type-name='health_view_bits1'/>
+            <bitfield type-name='health_view_bits1'/>
         </stl-vector>
         <stl-vector name="bits2">
-            <compound type-name='health_view_bits2'/>
+            <bitfield type-name='health_view_bits2'/>
         </stl-vector>
         <stl-vector name="bits3">
-            <compound type-name='health_view_bits3'/>
+            <bitfield type-name='health_view_bits3'/>
         </stl-vector>
         <int32_t name="x_cursor_pos"/>
     </class-type>
@@ -1206,7 +1206,7 @@
             <enum type-name='stockpile_list' base-type='int32_t'/>
         </stl-vector>
         <stl-vector name="group_bits">
-            <compound type-name='stockpile_group_set'/>
+            <bitfield type-name='stockpile_group_set'/>
         </stl-vector>
         <stl-vector name="list_ids">
             <enum type-name='stockpile_list' base-type='int32_t'/>
diff --git a/df.world-site.xml b/df.world-site.xml
index fde4991b0..af307def7 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -741,7 +741,7 @@
         <int32_t name="door_w_elevation"/>
         <compound name='door_item' type-name='site_building_item'/>
         <compound name='wall_item' type-name='site_building_item'/>
-        <compound name='shape' type-name='tower_shape'/>
+        <bitfield name='shape' type-name='tower_shape'/>
         <int32_t name="unk_40"/>
         <int32_t name="unk_44"/>
     </class-type>