Merge pull request #786 from quietust/master

Assorted fixes
DFHack · Jun 23, 2024 · 9a860f5 · 9a860f5
2 parents 3d8c648 + 52e418b
commit 9a860f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -467,9 +467,9 @@
         <int32_t name='vascular'/>
         <int32_t name='pain_receptors'/>
 
-        <int32_t name='position'/>
-        <enum name='relation' type-name='body_part_position_type'/>
-        <enum name='relation_bp' type-name='body_part_relation_type'/>
+        <enum name='position' type-name='body_part_position_type'/>
+        <enum name='relation' type-name='body_part_relation_type'/>
+        <int16_t name='relation_bp'/>
 
         <stl-vector name='bp_modifiers' type-name='int32_t'
                     refers-to='$$._global._upglobal._upglobal._upglobal.bp_appearance.modifier_idx[$].refers-to'/>

diff --git a/df.entities.xml b/df.entities.xml
@@ -706,7 +706,7 @@
             <stl-vector name='diplomacy'> sorted by group_id
                 <pointer> bay12: diplomacy_statest
                     <int32_t name='group_id' ref-target='historical_entity'/>
-                    <enum name='relation'> bay12: DiplomacyStateType
+                    <enum name='relation' base-type='int16_t'> bay12: DiplomacyStateType
                         <enum-item name='Peace'/>
                         <enum-item name='TotalWar'/>
                         <enum-item name='NoContact'/>