From 49594990093f75f46b7aa891582dd20db9834cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 16 Sep 2010 03:53:32 +0200
Subject: [PATCH] Fun and games of the offset kind. Most of Linux support for
 31.13. Weather is wrong.

---
 data/Memory-ng.xml              | 61 +++++++++++++++++++++++++++++++++
 tools/examples/creaturedump.cpp |  6 ++--
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index f331c10d2..1db405dae 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -1747,6 +1747,67 @@
             </Group>
         </Offsets>
     </Version>
+    <Version name="v0.31.13 linux" os="linux" base="v0.31.12 linux" rebase="-0xB7A8">
+        <MD5 value="d6307bd39b6271ba89bbdd953d27c84d" />
+        <Offsets>
+            <Group name="Buildings">
+                <Address name="buildings_vector" value="0x92fb8e8" />
+            </Group>
+            <Group name="Constructions">
+                <Address name="vector" value="0x92e7904" />
+            </Group>
+            <Group name="Creatures">
+                <Address name="current_civ" value="0x92e2d9c" />
+                <Address name="current_race" value="0x92e2da8" />
+                <Address name="vector" value="0x92fb260" />
+            </Group>
+            <Group name="Maps">
+                <Address name="map_data" value="0x933a4E0" />
+                <Address name="x_count_block" value="0x933a4F4" />
+                <Address name="y_count_block" value="0x933a4F8" />
+                <Address name="z_count_block" value="0x933a4FC" />
+                <Address name="x_count" value="0x933a500" />
+                <Address name="y_count" value="0x933a504" />
+                <Address name="z_count" value="0x933a508" />
+                <Address name="region_x" value="0x933a50C" />
+                <Address name="region_y" value="0x933a510" />
+                <Address name="region_z" value="0x933a514" />
+                <Address name="world_size_x" value="0x933BB60" />
+                <Address name="world_size_y" value="0x933BB62" />
+                <Group name="features">
+                    <Group name="global">
+                        <Address name="vector" value="0x933C0FC" />
+                    </Group>
+                    <Group name="local">
+                        <Address name="start_ptr" value="0x933C174" />
+                    </Group>
+                </Group>
+                <Group name="geology">
+                    <Address name="geoblock_vector" value="0x933C114" />
+                    <Address name="ptr2_region_array" value="0x933C138" />
+                </Group>
+            </Group>
+            <Group name="Position">
+                <Address name="window_x" value="0x8ceb238" />
+                <Address name="window_y" value="0x8ceb23C" />
+                <Address name="window_z" value="0x8ceb240" />
+                <Address name="cursor_xyz" value="0x8b2e740" />
+                <Address name="window_dims" value="0x8b2ec48" />
+                <Address name="screen_tiles_pointer" invalid = "true" />
+            </Group>
+            <Group name="GUI">
+                <Address name="pause_state" value="0x92e0e90"/>
+            </Group>
+            <Group name="Vegetation">
+                <Address name="vector" value="0x92fbdc8" />
+            </Group>
+            <Group name="World">
+                <Address name="current_year" value="0x92e0da0" />
+                <Address name="current_tick" value="0x92e0dc0" />
+                <Address name="current_weather" value="0x92e0e02" invalid="true" />
+            </Group>
+        </Offsets>
+    </Version>
 </DFHack>
 
 
diff --git a/tools/examples/creaturedump.cpp b/tools/examples/creaturedump.cpp
index eb611eefe..dddd6e018 100644
--- a/tools/examples/creaturedump.cpp
+++ b/tools/examples/creaturedump.cpp
@@ -134,7 +134,7 @@ likeType printLike40d(DFHack::t_like like, const matGlosses & mat,const vector<
 void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature)
 {
     uint32_t dayoflife;
-	cout << "address: " << hex <<  creature.origin << dec << " creature type: " << Materials->raceEx[creature.race].rawname 
+    cout << "address: " << hex <<  creature.origin << dec << ", creature race: " << creature.race << "/" << Materials->raceEx[creature.race].rawname 
                 << "[" << Materials->raceEx[creature.race].tile_character
                 << "," << Materials->raceEx[creature.race].tilecolor.fore
                 << "," << Materials->raceEx[creature.race].tilecolor.back
@@ -172,7 +172,7 @@ void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature)
 
         if(creature.civ)
         {
-            cout << "civilization: " << creature.civ;
+            cout << ", civilization: " << creature.civ;
             addendl = true;
         }
 
@@ -191,7 +191,7 @@ void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature)
             cout << endl;
             addendl = false;
         }
-        cout << "profession: " << mem->getProfession(creature.profession) << "(" << (int) creature.profession << ")";
+        cout << ", profession: " << mem->getProfession(creature.profession) << "(" << (int) creature.profession << ")";
         
         if(creature.custom_profession[0])
         {