From 8862a5b6e06cd344962e71ad44248cd93b5a12de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 23 Feb 2011 05:53:37 +0100
Subject: [PATCH] offset search improvements, some linux offsets

---
 data/Memory-ng.xml                    | 68 ++++++++++++++++++++++++++-
 tools/supported/incrementalsearch.cpp |  8 +++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index 23455ce71..313a67e22 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -2496,11 +2496,75 @@
             <Group name="name" valid="true" />
         </Offsets>
     </Version>
-    <Version name="v0.31.19 linux" os="linux" base="v0.31.18 linux" rebase="-0x77738">
+    <Version name="v0.31.19 linux" os="linux" base="v0.31.18 linux" rebase="0x77738">
         <MD5 value="8fcb1f10af9cc2bda47d2acf42e1db54" />
         <Offsets>
             <Group name="Position">
-                ... stuff
+                <Address name="cursor_xyz" value="0x8c2b560" />
+                <Address name="window_dims" value="0x8ba9680" />
+                <Address name="window_x" value="0x8d65c70" />
+                <Address name="window_y" value="0x8d65c74" />
+                <Address name="window_z" value="0x8d65c78" />
+            </Group>
+            <Group name="Maps">
+                <Group name="features" valid="true">
+                    <Group name="global">
+                        <Address name="vector" value="0x94397cc" />
+                        <!--
+                        <Offset name="funcptr" value="0x94" />
+                        <Offset name="material" value="0x28" />
+                        <Offset name="submaterial" value="0x2c" />
+                        -->
+                    </Group>
+                    <Group name="local">
+                        <Address name="start_ptr" value="0x9439844" />
+                        <!--
+                        <Offset name="material" value="0x24" />
+                        <Offset name="submaterial" value="0x28" />
+                        -->
+                    </Group>
+                </Group>
+            </Group>
+            <Group name="Materials">
+                <Address name="creature_type_vector" value="0x943a074" />
+                <Address name="inorganics" value="0x9439fc0" />
+                <Address name="organics_all" value="0x9439fd8" />
+                <Address name="organics_plants" value="0x9439fe4" />
+                <Address name="organics_trees" value="0x9439ffc" />
+                -------------------
+                !!LANGUAGE TABLES!!
+                -------------------
+                translation vector: 0x943a21c
+                lang vector: 0x943a204
+                word table offset: 0x1c
+                -------------
+                !!MATERIALS!!
+                -------------
+                inorganics:
+                0x9439fc0
+                organics:
+                0x9439fd8
+                organics 31.19:
+                trees:
+                0x9439ffc
+                plants:
+                0x9439fe4
+                color descriptors:
+                0x943e368
+                Amber color:0xa380190
+                all descriptors:
+                0x943e380
+                toad-first creature types:
+                0x943a074
+                all creature types:
+                0x943a068
+                0x943a074
+                Toad: 0xa441f10
+                Toad: rawname = 0x0
+                Toad: character (not reliable) = 0x20
+                Toad: caste vector = 0x60
+                Toad: extract? vector = 0x1f74
+                Toad: colors = 0x38
             </Group>
         </Offsets>
     </Version>
diff --git a/tools/supported/incrementalsearch.cpp b/tools/supported/incrementalsearch.cpp
index 8dc04cbc4..f95fba34f 100644
--- a/tools/supported/incrementalsearch.cpp
+++ b/tools/supported/incrementalsearch.cpp
@@ -749,12 +749,18 @@ void autoSearch(DFHack::Context * DF, vector <DFHack::t_memrange>& ranges)
 
     // organics vector
     to_filter = filtVectors;
+    sf.Filter<uint32_t,vecTriplet>(52 * 4,to_filter,vectorLength<uint32_t>);
+    sf.Filter<const char * ,vecTriplet>("MUSHROOM_HELMET_PLUMP",to_filter, vectorStringFirst);
+    printFound(to_filter,"organics");
+
+    // new organics vector
+    to_filter = filtVectors;
     sf.Filter<const char * ,vecTriplet>("MUSHROOM_HELMET_PLUMP",to_filter, vectorString);
     sf.Filter<const char * ,vecTriplet>("MEADOW-GRASS",to_filter, vectorString);
     sf.Filter<const char * ,vecTriplet>("TUNNEL_TUBE",to_filter, vectorString);
     sf.Filter<const char * ,vecTriplet>("WEED_BLADE",to_filter, vectorString);
     sf.Filter<const char * ,vecTriplet>("EYEBALL",to_filter, vectorString);
-    printFound(to_filter,"organics");
+    printFound(to_filter,"organics 31.19");
 
     // tree vector
     to_filter = filtVectors;