From 81cf60c0e08189f3acdf1ceff2399aca06174048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 13 Apr 2010 07:36:16 +0200
Subject: [PATCH] Fixes to creature offsets. Needs more checking.

---
 examples/creaturedump.cpp |  6 +++---
 output/Memory.xml         | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/examples/creaturedump.cpp b/examples/creaturedump.cpp
index a4ddf9739..89016c45f 100644
--- a/examples/creaturedump.cpp
+++ b/examples/creaturedump.cpp
@@ -332,12 +332,12 @@ void printCreature(DFHack::API & DF, const DFHack::t_creature & creature)
             cout << "from the underworld, ";
         }
         cout << endl;
-        /*
+        
         if(creature.flags1.bits.had_mood && (creature.mood == -1 || creature.mood == 8 ) )
         {
-            string artifact_name = DF.TranslateName(creature.artifact_name,englishWords,foreignWords,false);
+            string artifact_name = Tran->TranslateName(creature.artifact_name,false);
             cout << "artifact: " << artifact_name << endl;
-        }*/
+        }
     cout << endl;
 }
 
diff --git a/output/Memory.xml b/output/Memory.xml
index 3739e33b1..81a695cfc 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1135,7 +1135,7 @@ map_data_1b60_offset          0x1B9c
         <Offset name="creature_soulskill_vector">0X1F4</Offset>
         <Offset name="creature_pickup_equipment_bit">0X21C</Offset>
         <Offset name="creature_mood">0x238</Offset>
-        <Offset name="creature_pregnancy">0x23C</Offset>
+        <!--<Offset name="creature_pregnancy">0x23C</Offset>-->
         
         <Offset name="creature_physical">0x464</Offset>
         <!--
@@ -1354,6 +1354,36 @@ map_data_1b60_offset          0x1B9c
         <Address name="creature_vector">0x166FD0C</Address>
         <Address name="dwarf_race_index">0x01471fbc</Address>
         <!-- SOUL OFFSETS NEED FIXING -->
+        <Offset name="creature_name">0x0</Offset>
+        <Offset name="creature_custom_profession">0x6c</Offset>
+        <Offset name="creature_profession">0x88</Offset>
+        <Offset name="creature_race">0x8C</Offset>
+        <Offset name="creature_position">0x90</Offset>
+        <Offset name="creature_flags1">0xF8</Offset>
+        <Offset name="creature_flags2">0xFC</Offset>
+        <Offset name="creature_sex">0x110</Offset>
+        <Offset name="creature_id">0x114</Offset>
+        <Offset name="creature_side">0X120</Offset> <!-- what? -->
+        <Offset name="creature_soulskill_vector">0X1F4</Offset>
+        <Offset name="creature_pickup_equipment_bit">0X21C</Offset>
+        <Offset name="creature_mood">0x238</Offset>
+        <!--<Offset name="creature_pregnancy">0x23C</Offset>-->
+        
+        <Offset name="creature_physical">0x464</Offset>
+        <!--
+        <Offset name="creature_strength">0x464</Offset>
+        <Offset name="creature_agility">0x480</Offset>
+        <Offset name="creature_toughness">0x49C</Offset>
+        <Offset name="creature_endurance">0x4B8</Offset>
+        <Offset name="creature_recuperation">0x4D4</Offset>
+        <Offset name="creature_disease_resistance">0x4F0</Offset>
+        -->
+        <Offset name="creature_current_job">0x390</Offset> <!-- from chmod -->
+        <Offset name="creature_artifact_name">0x6D4</Offset>
+        <Offset name="creature_labors">0x774</Offset>
+        <Offset name="creature_soul_vector">0x0740</Offset>
+        <Offset name="creature_default_soul">0x0758</Offset>
+        <Offset name="creature_happiness">0x834</Offset>
         
         Materials
         =========