From 4bb05d015a4a878b21e7ed3c4b02088e813bc929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 8 Apr 2010 19:48:06 +0200
Subject: [PATCH] Support for v0.31.02

---
 examples/spatterdump.cpp | 50 ++++++++++++++++++++++++++++++++++++++++
 output/Memory.xml        | 16 +++++++++----
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/examples/spatterdump.cpp b/examples/spatterdump.cpp
index 6190eba24..a6e0fb3d6 100644
--- a/examples/spatterdump.cpp
+++ b/examples/spatterdump.cpp
@@ -24,6 +24,56 @@ using namespace std;
 
 using namespace DFHack;
 
+typedef uint32_t _DWORD;
+int get_material_vector(uint32_t vein_8, uint16_t vein_4, int WORLD_)
+{
+  int result; // eax@2
+  int v4; // ecx@11
+  int v5; // eax@12
+
+  if ( (uint16_t)(vein_4 - 0x1A3) > 0xC7u )
+  {
+    if ( ((int16_t)vein_4 < 19 || (int16_t)vein_4 > 0xDAu)
+      && (uint16_t)(vein_4 - 219) > 0xC7u )
+    {
+      if ( vein_4 )
+      {
+        if ( vein_4 > 0x292u )
+          result = 0;
+        else
+          result = *(_DWORD *)(WORLD_ + 4 * (int16_t)vein_4 + 0x5DF44);
+      }
+      else
+      {
+        if ( (signed int)vein_8 >= 0
+          && (v4 = *(_DWORD *)(WORLD_ + 0x54B88), vein_8 < (*(_DWORD *)(WORLD_ + 0x54B8C) - v4) >> 2)
+          && (v5 = *(_DWORD *)(v4 + 4 * vein_8)) != 0 )
+          result = v5 + 0x178;
+        else
+          result = *(_DWORD *)(WORLD_ + 0x5DF44);
+      }
+    }
+    else
+    {
+        /*
+      result = sub_4D47A0(vein_8, vein_4, WORLD_ + 0x54C84);
+      if ( !result )
+        result = *(_DWORD *)(WORLD_ + 0x5DF90);
+      */
+    }
+  }
+  else
+  {
+      /*
+    result = sub_41F430(WORLD_ + 0x54B94, vein_4);
+    if ( !result )
+      result = *(_DWORD *)(WORLD_ + 0x5E5D0);
+    */
+  }
+  return result;
+}
+
+
 char shades[10] = {'#','$','O','=','+','|','-','^','.',' '};
 int main (int numargs, const char ** args)
 {
diff --git a/output/Memory.xml b/output/Memory.xml
index 7cdbb2459..718358ea2 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -2980,6 +2980,8 @@ map_data_1b60_offset          0x1B9c
         <Offset name="creature_happiness">0x830</Offset>
 
         <Offset name="creature_soul_vector">0x073C</Offset>
+        <Offset name="creature_default_soul">0x0754</Offset>
+        
         <Offset name="soul_skills_vector">0x1F4</Offset>
         
         <!-- from DT -->
@@ -2992,11 +2994,16 @@ map_data_1b60_offset          0x1B9c
         <!-- Number vectors are vector <uint32_t> -->
         <!-- Others are vector<object *> -->
         <!-- first member of 'object' is a STL string with the name of said object -->
-        <Address name="mat_system_start">0x16afcec</Address>
+        
+        this is an array of 4B pointers to material templates and length 0x292
+        base_type_array = WORLD + 0x5DF44
+        <Address name="base_type_array">0x016b90cc</Address>
         <Address name="mat_templates">0x16afcec</Address>
         
         <!-- soil, stone, metal -->
+        inorganics vector = WORLD + 0x54B7C = 0x16AFD04
         <Address name="mat_inorganics">0x16afd04</Address>
+        <Offset name="inorganic_material_template_instantiation">0x178</Offset>
         
         <!-- wood and plant matter -->
         <Address name="mat_organics_all">0x16afd1C</Address>
@@ -3026,8 +3033,6 @@ map_data_1b60_offset          0x1B9c
         <Address name="creature_type_vector">0x016AFE58</Address>
         <!--<Address name="mat_creature_types2">0x16AEE08</Address>-->
         
-        this is an array of 4B pointers to material templates and length 0x292
-        <Address name="array_for_spatters?">0x016b90cc</Address>
         
         Constructions
         =============
@@ -3127,7 +3132,10 @@ map_data_1b60_offset          0x1B9c
         <Address name="z_count">0x09048d18</Address>
         -->
     </Entry>
-
+    <Entry version="v0.31.02" os="windows" id="0.31.02" base="0.31.01">
+        <String name="md5">23dfe141c7ea4e63ebb3c618a12b48ec</String>
+        <HexValue name="pe_timestamp">0x4BBDF378</HexValue>
+    </Entry>
                             .-"""-.
                            '       \
                           |,.  ,-.  |   _________________________