various fixes

PatrikLundell · Dec 1, 2017 · 661955e · 661955e
1 parent 7961387
commit 661955e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/df.entities.xml b/df.entities.xml
@@ -666,8 +666,8 @@
             <int16_t name='unk12a' init-value='-1'/>
             <int16_t name='unk12b' comment='uninitialized'/>
             <bool name='unk13' comment='0'/>
-            <pointer name='unk14' type-name='world_region'/>
-            <pointer name='unk15' type-name='world_landmass' has-bad-pointers='true'/>
+            <pointer name='unk14' type-name='world_landmass'/>
+            <pointer name='unk15' type-name='world_region' has-bad-pointers='true'/>
             <int32_t name='unk16' comment='uninitialized'/>
             <int16_t name='unk17' comment='0'/>
 

diff --git a/df.history.xml b/df.history.xml
@@ -91,6 +91,7 @@
 
             only a guess since most of figures have 102 (STANDARD); some have stuff like CLERK, SCOUT, BEAST_HUNTER, etc
             <enum base-type='int16_t' name='profession' type-name='profession'/>
+            <int32_t/>
         </pointer>
 
         <pointer name="pets">
@@ -1104,6 +1105,9 @@
         <int32_t name='unit' ref-target='unit'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='structure' ref-target='abstract_building'/>
+        <int32_t name='region' ref-target='world_region'/>
+        <int32_t name='layer' ref-target='world_underground_region'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_droppedst' inherits-from='history_event'>
@@ -1850,7 +1854,6 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
-        <int32_t/>
         <compound name='region_pos' type-name='coord2d'/>
     </class-type>
 

diff --git a/df.interaction.xml b/df.interaction.xml
@@ -288,8 +288,8 @@
 
     <class-type type-name='interaction_target_materialst' inherits-from='interaction_target'>
         <static-array name='material_str' type-name='stl-string' count='3'/>
-        <int16_t/>
-        <int32_t/>
+        <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
+        <int32_t name='mat_index'/>
         <int16_t/>
         <enum type-name='breath_attack_type' name='breath_attack_type'/>
         <bitfield name='restrictions' base-type='uint32_t'>