From 706769f96d074343c70b8287e85df77dcdbeb272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 21 Jun 2010 02:59:39 +0200
Subject: [PATCH] Arbitrary data search, some toad and elephant values, tiny
 little amount of valid offsets

---
 output/Memory.xml                      | 15 +++++---
 tools/playground/SegmentedFinder.h     |  4 +--
 tools/playground/incrementalsearch.cpp | 49 ++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/output/Memory.xml b/output/Memory.xml
index 33430714c..713b69010 100755
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1817,10 +1817,17 @@ map_data_1b60_offset          0x1B9c
         Creature type offsets
         =====================
         <Offset name="creature_type_caste_vector">0x60</Offset> VERIFIED
-        <Offset name="creature_type_extract_vector">0x1A14</Offset>
-        <Offset name="creature_tile">0xE0</Offset>
-        <Offset name="creature_tile_color">0xF6</Offset>
-        
+        from 0.31.08
+        Toad: 0xaf75b68
+        Toad: rawname = 0x0
+        Toad: character (not reliable) = 0x20
+        Toad: caste vector = 0x60
+        Toad: extract? vector = 0x18f4
+        Toad: colors = 0x36
+        <Offset name="creature_type_extract_vector">0x18f4</Offset> VERIFIED
+        <Offset name="creature_tile">0x20</Offset> VERIFIED
+        <Offset name="creature_tile_color">0x36</Offset> LOOKS OK
+
         <!--
         <Offset name="creature_type_caste_vector">0x138</Offset>
         <Offset name="creature_type_extract_vector">0x1A14</Offset>
diff --git a/tools/playground/SegmentedFinder.h b/tools/playground/SegmentedFinder.h
index c20805b3e..c50cc4c6f 100644
--- a/tools/playground/SegmentedFinder.h
+++ b/tools/playground/SegmentedFinder.h
@@ -292,9 +292,9 @@ struct Bytestream
     void * object;
 };
 
-bool findBytestream (SegmentedFinder* s, uint32_t *addr, Bytestream * compare )
+bool findBytestream (SegmentedFinder* s, void *addr, Bytestream compare )
 {
-    if(memcmp(addr, compare->object, compare->length) == 0)
+    if(memcmp(addr, compare.object, compare.length) == 0)
         return true;
     return false;
 }
diff --git a/tools/playground/incrementalsearch.cpp b/tools/playground/incrementalsearch.cpp
index 13c86e7e6..3e00e3155 100644
--- a/tools/playground/incrementalsearch.cpp
+++ b/tools/playground/incrementalsearch.cpp
@@ -553,6 +553,15 @@ void printFoundStrVec(vector <uint64_t> &found, const char * what, SegmentedFind
     }
 }
 
+// meh
+#pragma pack(1)
+struct tilecolors
+{
+    uint16_t fore;
+    uint16_t back;
+    uint16_t bright;
+};
+#pragma pack()
 
 void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& ranges)
 {
@@ -698,6 +707,7 @@ void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& rang
         vecTriplet *vtCretypes = sf.Translate<vecTriplet>(to_use);
         uint32_t elephant = sf.Read<uint32_t>(vtCretypes->start);
         uint64_t Eoffset;
+        cout << "Elephant: 0x" << hex << elephant << endl;
         cout << "Elephant: rawname = 0x0" << endl;
         Eoffset = sf.FindInRange<uint8_t,uint8_t> ('E',equalityP<uint8_t>, elephant, 0x300 );
         if(Eoffset)
@@ -709,12 +719,51 @@ void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& rang
         {
             cout << "Elephant: caste vector = 0x" << hex << Eoffset - elephant << endl;
         }
+        Eoffset = sf.FindInRange<const char *,vecTriplet> ("SKIN",vectorStringFirst, elephant, 0x1500 );
+        if(Eoffset)
+        {
+            cout << "Elephant: extract? vector = 0x" << hex << Eoffset - elephant << endl;
+        }
+        tilecolors eletc = {7,0,0};
+        Bytestream bs_eletc = {sizeof(tilecolors), &eletc};
+        Eoffset = sf.FindInRange<Bytestream,tilecolors> (bs_eletc, findBytestream, elephant, 0x300 );
+        if(Eoffset)
+        {
+            cout << "Elephant: colors = 0x" << hex << Eoffset - elephant << endl;
+        }
         //cout << "Amber color:" << hex << "0x" << colorObj << endl;
         // TODO: find string 'amber', the floats
     }
     if(!toad_first.empty())
     {
         to_use = toad_first[0];
+        vecTriplet *vtCretypes = sf.Translate<vecTriplet>(to_use);
+        uint32_t toad = sf.Read<uint32_t>(vtCretypes->start);
+        uint64_t Eoffset;
+        cout << "Toad: 0x" << hex << toad << endl;
+        cout << "Toad: rawname = 0x0" << endl;
+        Eoffset = sf.FindInRange<uint8_t,uint8_t> (0xF9,equalityP<uint8_t>, toad, 0x300 );
+        if(Eoffset)
+        {
+            cout << "Toad: character (not reliable) = 0x" << hex << Eoffset - toad << endl;
+        }
+        Eoffset = sf.FindInRange<const char *,vecTriplet> ("FEMALE",vectorStringFirst, toad, 0x300 );
+        if(Eoffset)
+        {
+            cout << "Toad: caste vector = 0x" << hex << Eoffset - toad << endl;
+        }
+        Eoffset = sf.FindInRange<const char *,vecTriplet> ("SKIN",vectorStringFirst, toad, 0x2000 );
+        if(Eoffset)
+        {
+            cout << "Toad: extract? vector = 0x" << hex << Eoffset - toad << endl;
+        }
+        tilecolors toadtc = {2,0,0};
+        Bytestream bs_toadc = {sizeof(tilecolors), &toadtc};
+        Eoffset = sf.FindInRange<Bytestream,tilecolors> (bs_toadc, findBytestream, toad, 0x300 );
+        if(Eoffset)
+        {
+            cout << "Toad: colors = 0x" << hex << Eoffset - toad << endl;
+        }
     }
     if(to_use)
     {