Misc uncommitted changes for v0.40 from my checkout.

DFHack · Dec 4, 2015 · 962b09c · 962b09c
1 parent 2bf67a6
commit 962b09c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
@@ -291,7 +291,7 @@
 
     <struct-type type-name='talk_choice'>
         <enum name='type' base-type='int32_t' type-name='talk_choice_type'/>
-        <int32_t/>
+        <pointer name='event' type-name='entity_event'/>
         <int32_t/>
         <int32_t/>
         <int32_t/>

diff --git a/df.items.xml b/df.items.xml
@@ -644,13 +644,13 @@
         -- Wielders
 
         <stl-vector name="slayers" type-name='int32_t' ref-target='historical_figure'/>
-        <stl-vector name="slayer_kill_counts" type-name='int32_t'/>
+        <stl-vector name="slayer_kill_counts" type-name='int32_t'/> naming weight 1
     </struct-type>
 
     <struct-type type-name='item_history_info'>
         <pointer name='kills' type-name='item_kill_info'/>
-        <int32_t name='unk1'/>
-        <int32_t name='unk2'/>
+        <int32_t name='unk1'/> naming weight 0.001
+        <int32_t name='unk2'/> naming weight 0.01
     </struct-type>
 
     <class-type type-name='item_actual' inherits-from='item' original-name='item_actualst'>

diff --git a/df.meeting.xml b/df.meeting.xml
@@ -481,7 +481,7 @@
                 <int32_t name='unk_v4014_1' comment='v0.40.14, uninit'/>
             </pointer>
         </stl-vector>
-        <int32_t/>
+        <int32_t name='unk_80_unit' ref-target='unit'/>
         <int32_t/>
         <int32_t/>
 
@@ -517,7 +517,7 @@
             <int32_t/>
             <int32_t/>
         </compound>
-        <stl-vector pointer-type='talk_choice'/>
+        <stl-vector name='choices' pointer-type='talk_choice'/>
         <int32_t init-value='-1'/>
         <int32_t/>?
         <int32_t/>?

diff --git a/df.units.xml b/df.units.xml
@@ -132,6 +132,9 @@
         <flag-bit name='unk27'/>
 
         <flag-bit name='gelded'/>
+        <flag-bit name='unk29'/>
+        <flag-bit name='injury_thought'/>
+        <flag-bit name='unk31'/>
     </bitfield-type>
 
     <enum-type type-name='value_type'>
@@ -543,7 +546,7 @@
 
         <stl-vector comment='v0.40.01'/>
         <stl-vector type-name='int32_t' comment='v0.40.01'/>
-        <stl-vector type-name='int32_t' ref-target='activity_entry'/>
+        <stl-vector name='activities' type-name='int32_t' ref-target='activity_entry'/>
         <stl-vector type-name='int32_t' comment='v0.40.01'/>
 
         <compound name='animal'>

diff --git a/match-vtables.pl b/match-vtables.pl
@@ -140,7 +140,7 @@ ($)
 }
 
 for my $vtname (sort keys %vtable_addrs) {
-    my $vmaddrs = $vmethod_addrs{$vtname};
+    my $vmaddrs = $vmethod_addrs{$vtname} or next;
     my $vtclass = prefix_class $vtname || '';
     my $vmnames = $vtable_names{$vtclass} || [];
     for (my $i = 0; $i < @$vmaddrs; $i++) {