Merge pull request #540 from ab9rf/5005-align-20k

realign: `creature_raw`, `army_controller`, `plant_growth`
DFHack · Jan 26, 2023 · 856273f · 856273f
2 parents 4bd9fe4 + dcefe19
commit 856273f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -1339,6 +1339,7 @@
         <int32_t name='next_modifier_id'/>
 
         <stl-vector name='raws' pointer-type='stl-string'/>
+        <static-array count='2' type-name='int32_t' name='statute_texpos' since='v0.50.01'/>
     </struct-type>
 
     <struct-type type-name='creature_variation_convert_tag'>

diff --git a/df.military.xml b/df.military.xml
@@ -400,12 +400,11 @@
         <int32_t name="unk_44_2"/>
         <int32_t name='visitor_nemesis_id' ref-target='nemesis_record' comment="Set for VillainousVisit"/>
         <int32_t name='unk_44_4' comment="3, 6 seen for Villain"/>
-        <pointer name="unk_44_5"/>
-        <pointer name="unk_v47_1" comment="Could be before unk_44: haven't found any non zero unk_44"/>
-        <pointer name="unk_v47_2"/>
+        <stl-vector name="unk_44_5" type-name='int32_t'/>
         <int32_t name="unk_50"/>
         <stl-vector name="unk_54" type-name='int32_t'/>
-        <stl-vector name='unk_44_11v' since='v0.44.11'/>
+        <stl-vector name='unk_44_11v' type-name='int32_t' since='v0.44.11'/>
+        <stl-vector name='unk_v50_b0' type-name='int32_t' since='v0.50.01'/>
         <pointer name='mission_report' type-name='mission_report'/>
         <compound name='data' is-union='true'>
             <pointer type-name='army_controller_sub1' name='t1'/>

diff --git a/df.plant-raws.xml b/df.plant-raws.xml
@@ -262,6 +262,11 @@
         </bitfield>
         <int32_t name='trunk_height_perc_1'/>
         <int32_t name='trunk_height_perc_2'/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t init-value='-1'/>
+        <int32_t init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='plant_growth_print'>