Give some sensible looking names to the arrays in pregnancy_ptr.

DFHack · Mar 31, 2012 · 767e2f6 · 767e2f6
1 parent 6acc7f1
commit 767e2f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -599,8 +599,8 @@
         <stl-vector type-name='int32_t' name='body_size_1'/>
         <stl-vector type-name='int32_t' name='body_size_2'/>
 
-        <stl-vector name='unk_1164'/>
-        <stl-vector name='unk_1174'/>
+        <stl-vector name='body_appearance_modifiers'/>
+        <stl-vector name='tissue_appearance_modifiers'/>
 
         <stl-vector name='unk_1184' type-name='int32_t'
                     index-refers-to='$$._global.unk_1194[$].refers-to'/>

diff --git a/df.items.xml b/df.items.xml
@@ -601,7 +601,7 @@
     <struct-type type-name='body_component_info'>
         <stl-vector name='body_part_308' type-name='uint32_t'/> // 87*0 ?
 
-        <stl-vector name='unk_318'/>
+        <stl-vector name='unk_318' type-name='uint32_t'/>
 
         <stl-vector name='body_layer_328' type-name='uint32_t'/>
         <stl-vector name='body_layer_338' type-name='uint32_t'/> // 238*0

diff --git a/df.units.xml b/df.units.xml
@@ -341,10 +341,7 @@
 
         <compound name='relations'>
             <uint32_t name='pregnancy_timer'/>
-            <pointer name='pregnancy_ptr'>
-                <df-array type-name='uint8_t'/>
-                <df-array type-name='int16_t'/>
-            </pointer>
+            <pointer name='pregnancy_ptr' type-name='unit_genes'/>
             <int16_t name='pregnancy_mystery' comment='-1 = crash, 1 = many cats'/>
             <int16_t name='unk_21c_b'/>
             <pointer name='ghost_info' type-name='unit_ghost_info'/>
@@ -443,7 +440,7 @@
                 <pointer type-name='unit_spatter'/>
             </stl-vector>
 
-            <stl-vector type-name='uint32_t' name='unk_4a8'/>
+            <stl-vector name='body_app_modifiers' type-name='uint32_t'/>
             <stl-vector type-name='uint32_t' name='unk_4b8'/>
             <uint32_t name='unk_4c8'/>
         </compound>
@@ -455,8 +452,7 @@
             <stl-vector type-name='int32_t' name='unk_4fc'/>
             <stl-vector type-name='int32_t' name='unk_50c'/>
 
-            <df-array name='unk_51c' type-name='uint8_t'/>
-            <df-array name="unk_524" type-name='int16_t'/>
+            <compound name='genes' type-name='unit_genes'/>
 
             <stl-vector name='colors' type-name='int32_t'/>
         </compound>
@@ -757,6 +753,13 @@
         <int32_t name="unk_28"/>
     </struct-type>
 
+    <struct-type type-name='unit_genes'>
+        <!-- length matches body_appearance_modifiers + tissue_appearance_modifiers -->
+        <df-array name='appearance' type-name='uint8_t'/>
+        <!-- two items per color modifier -->
+        <df-array name="colors" type-name='int16_t'/>
+    </struct-type>
+
     <struct-type type-name='unit_inventory_item'>
         <pointer name='item' type-name='item'/>