From 68b13d6bf0338c789ad19cf7ed0b4436e351a517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 2 Apr 2011 12:35:23 +0200
Subject: [PATCH] Dreary offset work.

---
 Memory.xml                        | 38 ++++++++++++++++++++++++++++++-
 library/DFProcess-linux-base.cpp  |  2 +-
 library/DFProcess_C.cpp           |  1 +
 tools/supported/SegmentedFinder.h |  1 +
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Memory.xml b/Memory.xml
index e527aa8d9..da19ec4fa 100644
--- a/Memory.xml
+++ b/Memory.xml
@@ -2155,6 +2155,7 @@
     <Version name="v0.31.25 SDL" os="windows" base="v0.31.24 SDL">
         <PETimeStamp value="0x4D90764F" />
         <MD5 value="6ada05fc94785b53efe6aa5728b3756b" />
+        Engravings: 0x16B0A78
     </Version>
                             .-"""-.
                            '       \
@@ -2684,6 +2685,17 @@
     <Version name="v0.31.22 linux" os="linux" base="v0.31.19 linux" rebase="0x12A80">
         <MD5 value="c7319be110759209bd736071fb367960" />
         <Offsets>
+            <Group name="Buildings" valid="true">
+                <Address name="buildings_vector" value="0x940b998" />
+                One of the two, really:
+                0x940b998
+                0x940b9a4
+                <Address name="custom_workshop_vector" value="0x94506f8" />
+            </Group>
+            <Group name="Constructions" valid="true">
+                <Address name="vector" value="0x93f7984" />
+                <Offset name="sizeof"/>
+            </Group>
             <Group name="Position">
                 <Address name="cursor_xyz" value="0x8c3dfc0" />
                 <Address name="window_dims" value="0x8c3e4c8" />
@@ -2769,9 +2781,33 @@
                 <Address name="language_vector" value="0x944c564"/>
                 <Address name="translation_vector" value="0x944c57c"/>
             </Group>
-
+            <Group name="Vegetation" valid="true">
+                <Address name="vector" value="0x940bed0" />
+            </Group>
+            <Group name="World">
+                
+                <Address name="control_mode" value="0x8c3dff0" />
+                <Address name="game_mode" value="0x8c3e000" />
+                <Address name="current_weather" value="0x936e248" valid="false" />
+                <Address name="current_year" value="0x936e264" valid="false" />
+                <Address name="current_tick" value="0x936e284" valid="false" />
+            </Group>
         </Offsets>
     </Version>
+    <Version name="v0.31.23 linux" os="linux" base="v0.31.22 linux">
+        <MD5 value="c8e82e6e7cc606bf4e8d2c91993b9c0d" />
+        <Offsets valid="false" />
+    </Version>
+    <Version name="v0.31.24 linux" os="linux" base="v0.31.23 linux">
+        <MD5 value="a47468cec4f4f0ff1fc03ac7d95c17ed" />
+        <Offsets valid="false" />
+    </Version>
+    <Version name="v0.31.25 linux" os="linux" base="v0.31.24 linux">
+        <MD5 value="fc15065c4d1977ca019c6dad220413d1" />
+        <Offsets valid="false" />
+        Engravings: 0x93f7918
+        there are some possibly related vectors right next to it.
+    </Version>
 </DFHack>
 
 
diff --git a/library/DFProcess-linux-base.cpp b/library/DFProcess-linux-base.cpp
index bbe4dc1ec..dfa50777e 100644
--- a/library/DFProcess-linux-base.cpp
+++ b/library/DFProcess-linux-base.cpp
@@ -89,7 +89,7 @@ void LinuxProcessBase::getMemRanges( vector<t_memrange> & ranges )
     {
         t_memrange temp;
         temp.name[0] = 0;
-        sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %s",
+        sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %[^\n]s",
                &start,
                &end,
                (char*)&permissions,
diff --git a/library/DFProcess_C.cpp b/library/DFProcess_C.cpp
index e7c589b50..870344e28 100644
--- a/library/DFProcess_C.cpp
+++ b/library/DFProcess_C.cpp
@@ -25,6 +25,7 @@ distribution.
 #include <vector>
 #include <algorithm>
 #include <string>
+#include <cstring>
 
 using namespace std;
 
diff --git a/tools/supported/SegmentedFinder.h b/tools/supported/SegmentedFinder.h
index 6177d0817..198d4e082 100644
--- a/tools/supported/SegmentedFinder.h
+++ b/tools/supported/SegmentedFinder.h
@@ -12,6 +12,7 @@ class SegmentFinder
     {
         _DF = DF;
         mr_ = mr;
+		valid=false;
         if(mr.valid)
         {
             mr_.buffer = (uint8_t *)malloc (mr_.end - mr_.start);