From e71f41fd42ee7daef17c9e8f71e307d198ca120a Mon Sep 17 00:00:00 2001
From: belal <jimbelal@gmail.com>
Date: Wed, 17 Feb 2010 18:33:08 -0500
Subject: [PATCH 01/16] test commit of notes-windows d17

Signed-off-by: belal <jimbelal@gmail.com>
---
 examples/CMakeLists.txt                 |  5 +++
 library/DFHackAPI.cpp                   | 57 ++++++++++++++++++++++++-
 library/DFHackAPI.h                     |  4 ++
 library/DFProcessEnumerator-windows.cpp |  6 +--
 library/DFTypes.h                       | 11 +++++
 output/Memory.xml                       |  6 +++
 6 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e5e133580..9aa1cec5f 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -42,6 +42,11 @@ TARGET_LINK_LIBRARIES(dfitemdump dfhack)
 ADD_EXECUTABLE(dfdigger digger.cpp)
 TARGET_LINK_LIBRARIES(dfdigger dfhack)
 
+# hotkeynotedump - dumps the hotkeys and notes for the loaded map
+# Author: belal
+ADD_EXECUTABLE(dfhotkeynotedump hotkeynotedump.cpp)
+TARGET_LINK_LIBRARIES(dfhotkeynotedump dfhack)
+
 IF(UNIX)
     # veinlook - look at the map... sort of
     ADD_EXECUTABLE(dfveinlook veinlook.cpp)
diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index ecab52de3..8540dc879 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -83,6 +83,11 @@ public:
 
     uint32_t item_material_offset;
 
+	uint32_t note_foreground_offset;
+	uint32_t note_background_offset;
+	uint32_t note_name_offset;
+	uint32_t note_xyz_offset;
+
     uint32_t dwarf_lang_table_offset;
 
     ProcessEnumerator* pm;
@@ -98,6 +103,7 @@ public:
     bool cursorWindowInited;
     bool viewSizeInited;
     bool itemsInited;
+	bool notesInited;
 
     bool nameTablesInited;
 
@@ -107,6 +113,7 @@ public:
     DfVector *p_bld;
     DfVector *p_veg;
     DfVector *p_itm;
+	DfVector *p_notes;
 };
 
 API::API (const string path_to_xml)
@@ -122,6 +129,7 @@ API::API (const string path_to_xml)
     d->cursorWindowInited = false;
     d->viewSizeInited = false;
     d->itemsInited = false;
+	d->notesInited = false;
     d->pm = NULL;
 }
 
@@ -853,7 +861,47 @@ bool API::InitReadCreatures( uint32_t &numcreatures )
         return false;
     }
 }
-
+bool API::InitReadNotes( uint32_t &numnotes )
+{
+    memory_info * minfo = d->offset_descriptor;
+    int notes = d->offset_descriptor->getAddress ("notes");
+    d->note_foreground_offset = minfo->getOffset ("note_foreground");
+	d->note_background_offset = minfo->getOffset ("note_background");
+	d->note_name_offset = minfo->getOffset ("note_name");
+	d->note_xyz_offset = minfo->getOffset ("note_xyz");
+    
+    if (notes
+            && d->note_foreground_offset
+            && d->note_background_offset
+            && d->note_name_offset
+            && d->note_xyz_offset
+       )
+    {
+        d->p_notes = new DfVector (d->p->readVector (notes, 4));
+        //InitReadNameTables();
+        d->notesInited = true;
+        numnotes =  d->p_notes->getSize();
+        return true;
+    }
+    else
+    {
+        d->notesInited = false;
+        numnotes = 0;
+        return false;
+    }
+}
+bool API::ReadNote (const int32_t &index, t_note & note)
+{
+    assert (d->notesInited);
+    // read pointer from vector at position
+    uint32_t temp = * (uint32_t *) d->p_notes->at (index);
+	note.symbol = g_pProcess->readByte(temp);
+	note.foreground = g_pProcess->readWord(temp + d->note_foreground_offset);
+	note.background = g_pProcess->readWord(temp + d->note_background_offset);
+	d->p->readSTLString (temp + d->note_name_offset, note.name, 128);
+	g_pProcess->read (temp + d->note_xyz_offset, 3*sizeof (uint16_t), (uint8_t *) &note.x);
+	return true;
+}
 // returns index of creature actually read or -1 if no creature can be found
 int32_t API::ReadCreatureInBox (int32_t index, t_creature & furball,
                                 const uint16_t &x1, const uint16_t &y1, const uint16_t &z1,
@@ -1087,6 +1135,13 @@ void API::FinishReadCreatures()
     d->creaturesInited = false;
     //FinishReadNameTables();
 }
+void API::FinishReadNotes()
+{
+    delete d->p_notes;
+    d->p_notes = NULL;
+    d->notesInited = false;
+    //FinishReadNameTables();
+}
 
 bool API::Attach()
 {
diff --git a/library/DFHackAPI.h b/library/DFHackAPI.h
index 21e3999cc..5f3dce912 100644
--- a/library/DFHackAPI.h
+++ b/library/DFHackAPI.h
@@ -171,6 +171,10 @@ namespace DFHack
         void WriteRaw (const uint32_t &offset, const uint32_t &size, uint8_t *source);
         
         bool InitViewAndCursor();
+
+		bool InitReadNotes( uint32_t & numnotes );
+		bool ReadNote(const int32_t &index, t_note & note);
+		void FinishReadNotes();
         
         bool getViewCoords (int32_t &x, int32_t &y, int32_t &z);
         bool setViewCoords (const int32_t &x, const int32_t &y, const int32_t &z);
diff --git a/library/DFProcessEnumerator-windows.cpp b/library/DFProcessEnumerator-windows.cpp
index ac11d2ea2..19491c279 100644
--- a/library/DFProcessEnumerator-windows.cpp
+++ b/library/DFProcessEnumerator-windows.cpp
@@ -77,7 +77,7 @@ bool ProcessEnumerator::findProcessess()
         }
         else
         {
-            delete p;
+//FIXME            delete p;
             p = 0;
         }
     }
@@ -102,7 +102,7 @@ bool ProcessEnumerator::findProcessess()
         }
         else
         {
-            delete q;
+  //FIXME          delete q;
 			q = 0;
         }
     }
@@ -134,7 +134,7 @@ void ProcessEnumerator::purge()
 {
     for(uint32_t i = 0;i < d->processes.size();i++)
     {
-        delete d->processes[i];
+ //FIXME       delete d->processes[i];
     }
     d->processes.clear();
 }
diff --git a/library/DFTypes.h b/library/DFTypes.h
index 08d49d624..61a05720b 100644
--- a/library/DFTypes.h
+++ b/library/DFTypes.h
@@ -753,5 +753,16 @@ struct t_viewscreen
     //There is more info in these objects, but I don't know what it is yet
 };
 
+struct t_note
+{
+    char symbol;
+	uint16_t foreground;
+	uint16_t background;
+	char name[128];
+	uint16_t x;
+	uint16_t y;
+	uint16_t z;
+};
+
 }// namespace DFHack
 #endif // TYPES_H_INCLUDED
diff --git a/output/Memory.xml b/output/Memory.xml
index f9bfd9c11..188c1501a 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1114,6 +1114,12 @@
         <Address name="view_screen">0x014243C4</Address>
         <Address name="current_cursor_creature">0x0178C994</Address>
         
+        <Address name="notes">0x014240A4</Address>
+        <Offset name="note_foreground">0x2</Offset>
+        <Offset name="note_background">0x4</Offset>
+        <Offset name="note_name">0x8</Offset>
+        <Offset name="note_xyz">0x24</Offset>
+        
         <VTable name="viewscreen_vtable">
             <class vtable="0x0092014C" name="viewscreen_conversation" />
             <class vtable="0x0092752C" name="viewscreen_option" />

From 42a12ffaec27a03dc95b84f9c83a327c377015a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Feb 2010 02:10:39 +0100
Subject: [PATCH 02/16] Veinlook now goes to map edges API change: isValidBlock
 now checks for map boundaries API change: added getBlockPtr. It returns a DF
 pointer to a block.

---
 examples/veinlook.cpp | 25 +++++++++++++++----------
 library/DFHackAPI.cpp |  9 +++++++++
 library/DFHackAPI.h   |  4 ++++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/examples/veinlook.cpp b/examples/veinlook.cpp
index a77f284c1..87832944c 100644
--- a/examples/veinlook.cpp
+++ b/examples/veinlook.cpp
@@ -272,11 +272,12 @@ main(int argc, char *argv[])
         finish(0);
     }
 
+    // FIXME: could fail on small forts
     int cursorX = x_max/2 - 1;
     int cursorY = y_max/2 - 1;
     int cursorZ = z_max/2 - 1;
     
-    // FIXME: could fail on small forts
+    
     
     int vein = 0;
     // walk the map!
@@ -318,13 +319,15 @@ main(int argc, char *argv[])
         cursorY = max(cursorY, 0);
         cursorZ = max(cursorZ, 0);
         
-        cursorX = min(cursorX, x_max - 3);
-        cursorY = min(cursorY, y_max - 3);
-        cursorZ = min(cursorZ, z_max - 3);        
+        cursorX = min(cursorX, x_max - 1);
+        cursorY = min(cursorY, y_max - 1);
+        cursorZ = min(cursorZ, z_max - 1);        
 
         DF.Suspend();
-        for(int i = 0; i < 3; i++)
-            for(int j = 0; j < 3; j++)
+        for(int i = -1; i <= 1; i++)
+        {
+            for(int j = -1; j <= 1; j++)
+            {
                 if(DF.isValidBlock(cursorX+i,cursorY+j,cursorZ))
                 {
                     // read data
@@ -338,22 +341,24 @@ main(int argc, char *argv[])
                             color = pickColor(tiletypes[x][y]);
                             if(designations[x][y].bits.hidden)
                             {
-                                puttile(x+i*16,y+j*16,tiletypes[x][y], color);
+                                puttile(x+(i+1)*16,y+(j+1)*16,tiletypes[x][y], color);
                             }
                             else
                             {
                                 attron(A_STANDOUT);
-                                puttile(x+i*16,y+j*16,tiletypes[x][y], color);
+                                puttile(x+(i+1)*16,y+(j+1)*16,tiletypes[x][y], color);
                                 attroff(A_STANDOUT);
                             }
                         }
                     }
-                    if(i == 1 && j == 1)
+                    if(i == 0 && j == 0)
                     {
                         veinVector.clear();
                         DF.ReadVeins(cursorX+i,cursorY+j,cursorZ,veinVector);
                     }
                 }
+            }
+        }
         gotoxy(0,48);
         cprintf("arrow keys, PGUP, PGDN = navigate");
         gotoxy(0,49);
@@ -361,7 +366,7 @@ main(int argc, char *argv[])
         gotoxy(0,50);
         if(vein == veinVector.size()) vein = veinVector.size() - 1;
         if(vein < -1) vein = -1;
-        cprintf("X %d/%d, Y %d/%d, Z %d/%d. Vein %d of %d",cursorX + 1,x_max,cursorY + 1,y_max,cursorZ + 1,z_max,vein+1,veinVector.size());
+        cprintf("X %d/%d, Y %d/%d, Z %d/%d. Vein %d of %d",cursorX+1,x_max,cursorY+1,y_max,cursorZ,z_max,vein+1,veinVector.size());
         if(!veinVector.empty())
         {
             if(vein != -1 && vein < veinVector.size())
diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index ecab52de3..4b66cd5e4 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -207,9 +207,18 @@ bool API::DestroyMap()
 
 bool API::isValidBlock (uint32_t x, uint32_t y, uint32_t z)
 {
+    if (x < 0 || x >= d->x_block_count || y < 0 || y >= d->y_block_count || z < 0 || z >= d->z_block_count)
+        return false;
     return d->block[x*d->y_block_count*d->z_block_count + y*d->z_block_count + z] != 0;
 }
 
+uint32_t API::getBlockPtr (uint32_t x, uint32_t y, uint32_t z)
+{
+    if (x < 0 || x >= d->x_block_count || y < 0 || y >= d->y_block_count || z < 0 || z >= d->z_block_count)
+        return 0;
+    return d->block[x*d->y_block_count*d->z_block_count + y*d->z_block_count + z];
+}
+
 // 256 * sizeof(uint16_t)
 bool API::ReadTileTypes (uint32_t x, uint32_t y, uint32_t z, uint16_t *buffer)
 {
diff --git a/library/DFHackAPI.h b/library/DFHackAPI.h
index 21e3999cc..aebce4590 100644
--- a/library/DFHackAPI.h
+++ b/library/DFHackAPI.h
@@ -128,6 +128,10 @@ namespace DFHack
          * Return false/0 on failure, buffer allocated by client app, 256 items long
          */
         bool isValidBlock(uint32_t blockx, uint32_t blocky, uint32_t blockz);
+        /**
+         * Get the address of a block or 0 if block is not valid
+         */
+        uint32_t getBlockPtr (uint32_t x, uint32_t y, uint32_t z);
         
         bool ReadTileTypes(uint32_t blockx, uint32_t blocky, uint32_t blockz, uint16_t *buffer); // 256 * sizeof(uint16_t)
         bool WriteTileTypes(uint32_t blockx, uint32_t blocky, uint32_t blockz, uint16_t *buffer); // 256 * sizeof(uint16_t)

From 387e1e879493b30a41b2210eb16e70086da88957 Mon Sep 17 00:00:00 2001
From: belal <jimbelal@gmail.com>
Date: Wed, 17 Feb 2010 21:08:54 -0500
Subject: [PATCH 03/16] Finish up code for hotkeys and notes, just need to find
 offsets for linux versions and windows < d17

Signed-off-by: belal <jimbelal@gmail.com>
---
 library/DFHackAPI.cpp | 40 +++++++++++++++++++++++++++++++++++++++-
 library/DFHackAPI.h   |  3 +++
 library/DFTypes.h     | 10 ++++++++++
 output/Memory.xml     |  5 +++++
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index 8540dc879..602f90e60 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -87,7 +87,11 @@ public:
 	uint32_t note_background_offset;
 	uint32_t note_name_offset;
 	uint32_t note_xyz_offset;
-
+	uint32_t hotkey_start;
+	uint32_t hotkey_mode_offset;
+	uint32_t hotkey_xyz_offset;
+	uint32_t hotkey_size;
+    
     uint32_t dwarf_lang_table_offset;
 
     ProcessEnumerator* pm;
@@ -104,6 +108,7 @@ public:
     bool viewSizeInited;
     bool itemsInited;
 	bool notesInited;
+	bool hotkeyInited;
 
     bool nameTablesInited;
 
@@ -130,6 +135,7 @@ API::API (const string path_to_xml)
     d->viewSizeInited = false;
     d->itemsInited = false;
 	d->notesInited = false;
+	d->hotkeyInited = false;
     d->pm = NULL;
 }
 
@@ -902,6 +908,38 @@ bool API::ReadNote (const int32_t &index, t_note & note)
 	g_pProcess->read (temp + d->note_xyz_offset, 3*sizeof (uint16_t), (uint8_t *) &note.x);
 	return true;
 }
+bool API::InitReadHotkeys( )
+{
+    memory_info * minfo = d->offset_descriptor;
+	d->hotkey_start = minfo->getAddress("hotkey_start");
+    d->hotkey_mode_offset = minfo->getOffset ("hotkey_mode");
+	d->hotkey_xyz_offset = minfo->getOffset("hotkey_xyz");
+	d->hotkey_size = minfo->getHexValue("hotkey_size");
+	    
+    if (d->hotkey_start && d->hotkey_mode_offset && d->hotkey_size)
+    {
+		d->hotkeyInited = true;
+		return true;
+    }
+    else
+    {
+        d->hotkeyInited = false;
+        return false;
+    }
+}
+bool API::ReadHotkeys(t_hotkey hotkeys[])
+{
+    assert (d->hotkeyInited);
+	uint32_t currHotkey = d->hotkey_start;
+	for(uint32_t i = 0 ; i < NUM_HOTKEYS ;i++)
+	{
+		d->p->readSTLString(currHotkey,hotkeys[i].name,10);
+		hotkeys[i].mode = g_pProcess->readWord(currHotkey+d->hotkey_mode_offset);
+		g_pProcess->read (currHotkey + d->hotkey_xyz_offset, 3*sizeof (int32_t), (uint8_t *) &hotkeys[i].x);
+		currHotkey+=d->hotkey_size;
+	}
+	return true;
+}
 // returns index of creature actually read or -1 if no creature can be found
 int32_t API::ReadCreatureInBox (int32_t index, t_creature & furball,
                                 const uint16_t &x1, const uint16_t &y1, const uint16_t &z1,
diff --git a/library/DFHackAPI.h b/library/DFHackAPI.h
index 5f3dce912..ce7ef8dac 100644
--- a/library/DFHackAPI.h
+++ b/library/DFHackAPI.h
@@ -175,6 +175,9 @@ namespace DFHack
 		bool InitReadNotes( uint32_t & numnotes );
 		bool ReadNote(const int32_t &index, t_note & note);
 		void FinishReadNotes();
+
+		bool InitReadHotkeys( );
+		bool ReadHotkeys(t_hotkey hotkeys[]);
         
         bool getViewCoords (int32_t &x, int32_t &y, int32_t &z);
         bool setViewCoords (const int32_t &x, const int32_t &y, const int32_t &z);
diff --git a/library/DFTypes.h b/library/DFTypes.h
index 61a05720b..717c82180 100644
--- a/library/DFTypes.h
+++ b/library/DFTypes.h
@@ -764,5 +764,15 @@ struct t_note
 	uint16_t z;
 };
 
+#define NUM_HOTKEYS 16
+struct t_hotkey
+{
+	char name[10];
+	int16_t mode;
+	int32_t x;
+	int32_t y;
+	int32_t z;
+};
+
 }// namespace DFHack
 #endif // TYPES_H_INCLUDED
diff --git a/output/Memory.xml b/output/Memory.xml
index 188c1501a..5c1d2a8e8 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1120,6 +1120,11 @@
         <Offset name="note_name">0x8</Offset>
         <Offset name="note_xyz">0x24</Offset>
         
+        <Address name="hotkey_start">0x14240DC</Address><!-- 0x018F40DC -->
+        <Offset name="hotkey_mode">0x1C</Offset>
+        <Offset name="hotkey_xyz">0x20</Offset>
+        <HexValue name="hotkey_size">0x2C</HexValue>
+        
         <VTable name="viewscreen_vtable">
             <class vtable="0x0092014C" name="viewscreen_conversation" />
             <class vtable="0x0092752C" name="viewscreen_option" />

From a0a50b9498f78b2fa73ba48274878f3dda174265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Feb 2010 04:03:30 +0100
Subject: [PATCH 04/16] Added some more ignore rules

---
 .gitignore | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..10760875f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+# linux backup files
+*~
+
+# compiled binaries
+output/*
+
+# this one is important, track it
+!output/Memory.xml
+
+# a file generated by cmake
+library/config.h
+
+# any build folders
+build*/
+
+#except for the real one
+!build/
+
+#ignore Kdevelop stuff
+.kdev4

From 3ac42b79601dd8c796dcf5edc3d4e2a0fa57fad2 Mon Sep 17 00:00:00 2001
From: belal <jimbelal@gmail.com>
Date: Thu, 18 Feb 2010 09:27:22 -0500
Subject: [PATCH 05/16] Add missing hotkeynotedump.cpp, thanks peterix

Signed-off-by: belal <jimbelal@gmail.com>
---
 examples/hotkeynotedump.cpp | 61 +++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 examples/hotkeynotedump.cpp

diff --git a/examples/hotkeynotedump.cpp b/examples/hotkeynotedump.cpp
new file mode 100644
index 000000000..cda81ab34
--- /dev/null
+++ b/examples/hotkeynotedump.cpp
@@ -0,0 +1,61 @@
+// Hotkey and Note Dump
+
+#include <iostream>
+#include <climits>
+#include <integers.h>
+#include <vector>
+using namespace std;
+
+#include <DFTypes.h>
+#include <DFHackAPI.h>
+#include <DFMemInfo.h>
+
+
+int main (void)
+{
+    vector<DFHack::t_matgloss> creaturestypes;
+    DFHack::API DF("Memory.xml");
+    if(!DF.Attach())
+    {
+        cerr << "DF not found" << endl;
+        return 1;
+    }
+    
+	DFHack::memory_info mem = DF.getMemoryInfo();
+    // get stone matgloss mapping
+	uint32_t numNotes;
+	if(!DF.InitReadNotes(numNotes))
+	{
+		cerr << "Can't get notes" << endl;
+		return 1;
+	}
+	if(!DF.InitReadHotkeys())
+	{
+		cerr << "Can't get hotkeys" << endl;
+		return 1;
+	}
+	cout << "Notes" << endl;
+    for(uint32_t i = 0; i < numNotes; i++)
+    {
+		DFHack::t_note temp;
+		DF.ReadNote(i,temp);
+		cout << "x: " << temp.x << "\ty: " << temp.y << "\tz: " << temp.z <<
+			"\tsymbol: " << temp.symbol << "\tfg: " << temp.foreground << "\tbg: " << temp.background <<
+			"\ttext: " << temp.name << endl;
+	}
+	cout << "Hotkeys" << endl;
+	DFHack::t_hotkey hotkeys[NUM_HOTKEYS];
+	DF.ReadHotkeys(hotkeys);
+	for(uint32_t i =0;i< NUM_HOTKEYS;i++)
+	{
+		cout << "x: " << hotkeys[i].x << "\ty: " << hotkeys[i].y << "\tz: " << hotkeys[i].z <<
+			"\ttext: " << hotkeys[i].name << endl;
+	}
+	DF.FinishReadNotes();
+	DF.Detach();
+    #ifndef LINUX_BUILD
+    cout << "Done. Press any key to continue" << endl;
+    cin.ignore();
+    #endif
+    return 0;
+}
\ No newline at end of file

From 6b92ea274d2a399f647f93f6acde4c5ffc9e606b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Feb 2010 17:58:25 +0100
Subject: [PATCH 06/16] Veinlook shows material of mineral veins

---
 examples/veinlook.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/veinlook.cpp b/examples/veinlook.cpp
index 87832944c..5e81803c4 100644
--- a/examples/veinlook.cpp
+++ b/examples/veinlook.cpp
@@ -407,6 +407,8 @@ main(int argc, char *argv[])
                             }
                         }
                     }
+                    gotoxy(0,52);
+                    cprintf("%s",stonetypes[veinVector[vein].type].name);
                 }
                 gotoxy(0,51);
                 cprintf("%s, address 0x%x",str.c_str(),veinVector[vein].address_of);

From e9e1d2b8b9ff6e8ea83b89bee3d02cad5b672dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Feb 2010 18:06:32 +0100
Subject: [PATCH 07/16] Tabs to spaces

---
 examples/hotkeynotedump.cpp             | 60 +++++++++----------
 library/DFHackAPI.cpp                   | 76 ++++++++++++-------------
 library/DFHackAPI.h                     | 10 ++--
 library/DFProcessEnumerator-windows.cpp |  4 +-
 library/DFTypes.h                       | 22 +++----
 5 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/examples/hotkeynotedump.cpp b/examples/hotkeynotedump.cpp
index cda81ab34..9685e33d5 100644
--- a/examples/hotkeynotedump.cpp
+++ b/examples/hotkeynotedump.cpp
@@ -1,5 +1,5 @@
 // Hotkey and Note Dump
-
+// Or Hot Keynote Dump? :P
 #include <iostream>
 #include <climits>
 #include <integers.h>
@@ -21,38 +21,38 @@ int main (void)
         return 1;
     }
     
-	DFHack::memory_info mem = DF.getMemoryInfo();
+    DFHack::memory_info mem = DF.getMemoryInfo();
     // get stone matgloss mapping
-	uint32_t numNotes;
-	if(!DF.InitReadNotes(numNotes))
-	{
-		cerr << "Can't get notes" << endl;
-		return 1;
-	}
-	if(!DF.InitReadHotkeys())
-	{
-		cerr << "Can't get hotkeys" << endl;
-		return 1;
-	}
-	cout << "Notes" << endl;
+    uint32_t numNotes;
+    if(!DF.InitReadNotes(numNotes))
+    {
+        cerr << "Can't get notes" << endl;
+        return 1;
+    }
+    if(!DF.InitReadHotkeys())
+    {
+        cerr << "Can't get hotkeys" << endl;
+        return 1;
+    }
+    cout << "Notes" << endl;
     for(uint32_t i = 0; i < numNotes; i++)
     {
-		DFHack::t_note temp;
-		DF.ReadNote(i,temp);
-		cout << "x: " << temp.x << "\ty: " << temp.y << "\tz: " << temp.z <<
-			"\tsymbol: " << temp.symbol << "\tfg: " << temp.foreground << "\tbg: " << temp.background <<
-			"\ttext: " << temp.name << endl;
-	}
-	cout << "Hotkeys" << endl;
-	DFHack::t_hotkey hotkeys[NUM_HOTKEYS];
-	DF.ReadHotkeys(hotkeys);
-	for(uint32_t i =0;i< NUM_HOTKEYS;i++)
-	{
-		cout << "x: " << hotkeys[i].x << "\ty: " << hotkeys[i].y << "\tz: " << hotkeys[i].z <<
-			"\ttext: " << hotkeys[i].name << endl;
-	}
-	DF.FinishReadNotes();
-	DF.Detach();
+        DFHack::t_note temp;
+        DF.ReadNote(i,temp);
+        cout << "x: " << temp.x << "\ty: " << temp.y << "\tz: " << temp.z <<
+            "\tsymbol: " << temp.symbol << "\tfg: " << temp.foreground << "\tbg: " << temp.background <<
+            "\ttext: " << temp.name << endl;
+    }
+    cout << "Hotkeys" << endl;
+    DFHack::t_hotkey hotkeys[NUM_HOTKEYS];
+    DF.ReadHotkeys(hotkeys);
+    for(uint32_t i =0;i< NUM_HOTKEYS;i++)
+    {
+        cout << "x: " << hotkeys[i].x << "\ty: " << hotkeys[i].y << "\tz: " << hotkeys[i].z <<
+            "\ttext: " << hotkeys[i].name << endl;
+    }
+    DF.FinishReadNotes();
+    DF.Detach();
     #ifndef LINUX_BUILD
     cout << "Done. Press any key to continue" << endl;
     cin.ignore();
diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index 3594773dd..18334c2db 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -83,14 +83,14 @@ public:
 
     uint32_t item_material_offset;
 
-	uint32_t note_foreground_offset;
-	uint32_t note_background_offset;
-	uint32_t note_name_offset;
-	uint32_t note_xyz_offset;
-	uint32_t hotkey_start;
-	uint32_t hotkey_mode_offset;
-	uint32_t hotkey_xyz_offset;
-	uint32_t hotkey_size;
+    uint32_t note_foreground_offset;
+    uint32_t note_background_offset;
+    uint32_t note_name_offset;
+    uint32_t note_xyz_offset;
+    uint32_t hotkey_start;
+    uint32_t hotkey_mode_offset;
+    uint32_t hotkey_xyz_offset;
+    uint32_t hotkey_size;
     
     uint32_t dwarf_lang_table_offset;
 
@@ -107,8 +107,8 @@ public:
     bool cursorWindowInited;
     bool viewSizeInited;
     bool itemsInited;
-	bool notesInited;
-	bool hotkeyInited;
+    bool notesInited;
+    bool hotkeyInited;
 
     bool nameTablesInited;
 
@@ -118,7 +118,7 @@ public:
     DfVector *p_bld;
     DfVector *p_veg;
     DfVector *p_itm;
-	DfVector *p_notes;
+    DfVector *p_notes;
 };
 
 API::API (const string path_to_xml)
@@ -134,8 +134,8 @@ API::API (const string path_to_xml)
     d->cursorWindowInited = false;
     d->viewSizeInited = false;
     d->itemsInited = false;
-	d->notesInited = false;
-	d->hotkeyInited = false;
+    d->notesInited = false;
+    d->hotkeyInited = false;
     d->pm = NULL;
 }
 
@@ -860,7 +860,7 @@ bool API::InitReadCreatures( uint32_t &numcreatures )
             && d->creature_labors_offset
             && d->creature_happiness_offset
             && d->creature_traits_offset
-	//       && d->creature_likes_offset
+    //       && d->creature_likes_offset
        )
     {
         d->p_cre = new DfVector (d->p->readVector (creatures, 4));
@@ -881,9 +881,9 @@ bool API::InitReadNotes( uint32_t &numnotes )
     memory_info * minfo = d->offset_descriptor;
     int notes = d->offset_descriptor->getAddress ("notes");
     d->note_foreground_offset = minfo->getOffset ("note_foreground");
-	d->note_background_offset = minfo->getOffset ("note_background");
-	d->note_name_offset = minfo->getOffset ("note_name");
-	d->note_xyz_offset = minfo->getOffset ("note_xyz");
+    d->note_background_offset = minfo->getOffset ("note_background");
+    d->note_name_offset = minfo->getOffset ("note_name");
+    d->note_xyz_offset = minfo->getOffset ("note_xyz");
     
     if (notes
             && d->note_foreground_offset
@@ -910,25 +910,25 @@ bool API::ReadNote (const int32_t &index, t_note & note)
     assert (d->notesInited);
     // read pointer from vector at position
     uint32_t temp = * (uint32_t *) d->p_notes->at (index);
-	note.symbol = g_pProcess->readByte(temp);
-	note.foreground = g_pProcess->readWord(temp + d->note_foreground_offset);
-	note.background = g_pProcess->readWord(temp + d->note_background_offset);
-	d->p->readSTLString (temp + d->note_name_offset, note.name, 128);
-	g_pProcess->read (temp + d->note_xyz_offset, 3*sizeof (uint16_t), (uint8_t *) &note.x);
-	return true;
+    note.symbol = g_pProcess->readByte(temp);
+    note.foreground = g_pProcess->readWord(temp + d->note_foreground_offset);
+    note.background = g_pProcess->readWord(temp + d->note_background_offset);
+    d->p->readSTLString (temp + d->note_name_offset, note.name, 128);
+    g_pProcess->read (temp + d->note_xyz_offset, 3*sizeof (uint16_t), (uint8_t *) &note.x);
+    return true;
 }
 bool API::InitReadHotkeys( )
 {
     memory_info * minfo = d->offset_descriptor;
-	d->hotkey_start = minfo->getAddress("hotkey_start");
+    d->hotkey_start = minfo->getAddress("hotkey_start");
     d->hotkey_mode_offset = minfo->getOffset ("hotkey_mode");
-	d->hotkey_xyz_offset = minfo->getOffset("hotkey_xyz");
-	d->hotkey_size = minfo->getHexValue("hotkey_size");
-	    
+    d->hotkey_xyz_offset = minfo->getOffset("hotkey_xyz");
+    d->hotkey_size = minfo->getHexValue("hotkey_size");
+        
     if (d->hotkey_start && d->hotkey_mode_offset && d->hotkey_size)
     {
-		d->hotkeyInited = true;
-		return true;
+        d->hotkeyInited = true;
+        return true;
     }
     else
     {
@@ -939,15 +939,15 @@ bool API::InitReadHotkeys( )
 bool API::ReadHotkeys(t_hotkey hotkeys[])
 {
     assert (d->hotkeyInited);
-	uint32_t currHotkey = d->hotkey_start;
-	for(uint32_t i = 0 ; i < NUM_HOTKEYS ;i++)
-	{
-		d->p->readSTLString(currHotkey,hotkeys[i].name,10);
-		hotkeys[i].mode = g_pProcess->readWord(currHotkey+d->hotkey_mode_offset);
-		g_pProcess->read (currHotkey + d->hotkey_xyz_offset, 3*sizeof (int32_t), (uint8_t *) &hotkeys[i].x);
-		currHotkey+=d->hotkey_size;
-	}
-	return true;
+    uint32_t currHotkey = d->hotkey_start;
+    for(uint32_t i = 0 ; i < NUM_HOTKEYS ;i++)
+    {
+        d->p->readSTLString(currHotkey,hotkeys[i].name,10);
+        hotkeys[i].mode = g_pProcess->readWord(currHotkey+d->hotkey_mode_offset);
+        g_pProcess->read (currHotkey + d->hotkey_xyz_offset, 3*sizeof (int32_t), (uint8_t *) &hotkeys[i].x);
+        currHotkey+=d->hotkey_size;
+    }
+    return true;
 }
 // returns index of creature actually read or -1 if no creature can be found
 int32_t API::ReadCreatureInBox (int32_t index, t_creature & furball,
diff --git a/library/DFHackAPI.h b/library/DFHackAPI.h
index 7601d17d7..f41647261 100644
--- a/library/DFHackAPI.h
+++ b/library/DFHackAPI.h
@@ -176,12 +176,12 @@ namespace DFHack
         
         bool InitViewAndCursor();
 
-		bool InitReadNotes( uint32_t & numnotes );
-		bool ReadNote(const int32_t &index, t_note & note);
-		void FinishReadNotes();
+        bool InitReadNotes( uint32_t & numnotes );
+        bool ReadNote(const int32_t &index, t_note & note);
+        void FinishReadNotes();
 
-		bool InitReadHotkeys( );
-		bool ReadHotkeys(t_hotkey hotkeys[]);
+        bool InitReadHotkeys( );
+        bool ReadHotkeys(t_hotkey hotkeys[]);
         
         bool getViewCoords (int32_t &x, int32_t &y, int32_t &z);
         bool setViewCoords (const int32_t &x, const int32_t &y, const int32_t &z);
diff --git a/library/DFProcessEnumerator-windows.cpp b/library/DFProcessEnumerator-windows.cpp
index 19491c279..f08aec558 100644
--- a/library/DFProcessEnumerator-windows.cpp
+++ b/library/DFProcessEnumerator-windows.cpp
@@ -73,7 +73,7 @@ bool ProcessEnumerator::findProcessess()
         if(p->isIdentified())
         {
             d->processes.push_back(p);
-			return true;
+            return true;
         }
         else
         {
@@ -103,7 +103,7 @@ bool ProcessEnumerator::findProcessess()
         else
         {
   //FIXME          delete q;
-			q = 0;
+            q = 0;
         }
     }
     if(d->processes.size())
diff --git a/library/DFTypes.h b/library/DFTypes.h
index 717c82180..50e36d898 100644
--- a/library/DFTypes.h
+++ b/library/DFTypes.h
@@ -756,22 +756,22 @@ struct t_viewscreen
 struct t_note
 {
     char symbol;
-	uint16_t foreground;
-	uint16_t background;
-	char name[128];
-	uint16_t x;
-	uint16_t y;
-	uint16_t z;
+    uint16_t foreground;
+    uint16_t background;
+    char name[128];
+    uint16_t x;
+    uint16_t y;
+    uint16_t z;
 };
 
 #define NUM_HOTKEYS 16
 struct t_hotkey
 {
-	char name[10];
-	int16_t mode;
-	int32_t x;
-	int32_t y;
-	int32_t z;
+    char name[10];
+    int16_t mode;
+    int32_t x;
+    int32_t y;
+    int32_t z;
 };
 
 }// namespace DFHack

From 1c64010b8092b28b0b2c3b4447ba1e625f946c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Feb 2010 20:16:05 +0100
Subject: [PATCH 08/16] Missed one glitch in the merge

---
 examples/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 203f3aa5b..058d5014c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -58,7 +58,6 @@ dfattachtest
 dfbuildingsdump
 dfcreaturedump
 dfitemdump
-dfdigger
 dfexpbench
 dfmaterialtest
 dfposition

From da19d92f1655db5e3a711e50524cb0532b365b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 18 Feb 2010 21:28:28 +0100
Subject: [PATCH 09/16] Asserts into IFs

---
 library/DFHackAPI.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index 18334c2db..1739b20e1 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -907,7 +907,8 @@ bool API::InitReadNotes( uint32_t &numnotes )
 }
 bool API::ReadNote (const int32_t &index, t_note & note)
 {
-    assert (d->notesInited);
+    if(!d->notesInited)
+        return false;
     // read pointer from vector at position
     uint32_t temp = * (uint32_t *) d->p_notes->at (index);
     note.symbol = g_pProcess->readByte(temp);
@@ -938,7 +939,8 @@ bool API::InitReadHotkeys( )
 }
 bool API::ReadHotkeys(t_hotkey hotkeys[])
 {
-    assert (d->hotkeyInited);
+    if (!d->hotkeyInited)
+        return false;
     uint32_t currHotkey = d->hotkey_start;
     for(uint32_t i = 0 ; i < NUM_HOTKEYS ;i++)
     {

From 7ce8935aef007985536952f6824d47c22f78420d Mon Sep 17 00:00:00 2001
From: belal <jimbelal@gmail.com>
Date: Thu, 18 Feb 2010 15:29:45 -0500
Subject: [PATCH 10/16] Add offsets for versions d9-d17 for windows and linux,
 windows has been tested, linux has not, but it should be right unless I
 screwed something up

Signed-off-by: belal <jimbelal@gmail.com>
---
 library/integers.h |  2 +-
 output/Memory.xml  | 47 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/library/integers.h b/library/integers.h
index a9270330c..6cc2396c4 100644
--- a/library/integers.h
+++ b/library/integers.h
@@ -13,4 +13,4 @@ You can turn off the include by defining SKIP_DFHACK_STDINT
     #else
         #include "stdint_win.h"
     #endif
-#endif
+#endif
diff --git a/output/Memory.xml b/output/Memory.xml
index 5c1d2a8e8..ad3601644 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -800,6 +800,18 @@
         <Address name="window_y">0xcdc3dc</Address>
         <Address name="window_z">0xcdc3b8</Address>
         <Address name="window_dims">0x1676f14</Address>
+        
+        <Address name="notes">0x012FDBAC</Address>
+        <Offset name="note_foreground">0x2</Offset>
+        <Offset name="note_background">0x4</Offset>
+        <Offset name="note_name">0x8</Offset>
+        <Offset name="note_xyz">0x24</Offset>
+        
+        <Address name="hotkey_start">0x012FDBE4</Address>
+        <Offset name="hotkey_mode">0x1C</Offset>
+        <Offset name="hotkey_xyz">0x20</Offset>
+        <HexValue name="hotkey_size">0x2C</HexValue>
+        
     </Entry>
     <Entry version="v0.28.181.40d11" os="windows" rebase="0x2d388" id="40d11win" base="40d9win">
         <!-- identification -->
@@ -811,6 +823,9 @@
         <Address name="window_x">0xcdf5a0</Address>
         <Address name="window_y">0xd0d64c</Address>
         <Address name="window_z">0xd0d628</Address>
+        
+        <Address name="notes">0x013E853C</Address>     
+        <Address name="hotkey_start">0x013E8574</Address>
     </Entry>
     <Entry version="v0.28.181.40d12" os="windows" id="40d12win" base="40d11win">
         <!-- identification -->
@@ -1114,16 +1129,8 @@
         <Address name="view_screen">0x014243C4</Address>
         <Address name="current_cursor_creature">0x0178C994</Address>
         
-        <Address name="notes">0x014240A4</Address>
-        <Offset name="note_foreground">0x2</Offset>
-        <Offset name="note_background">0x4</Offset>
-        <Offset name="note_name">0x8</Offset>
-        <Offset name="note_xyz">0x24</Offset>
-        
-        <Address name="hotkey_start">0x14240DC</Address><!-- 0x018F40DC -->
-        <Offset name="hotkey_mode">0x1C</Offset>
-        <Offset name="hotkey_xyz">0x20</Offset>
-        <HexValue name="hotkey_size">0x2C</HexValue>
+        <Address name="notes">0x014240A4</Address>     
+        <Address name="hotkey_start">0x014240DC</Address>
         
         <VTable name="viewscreen_vtable">
             <class vtable="0x0092014C" name="viewscreen_conversation" />
@@ -1513,6 +1520,17 @@
         <Address name="matgloss">0x9374E88</Address>
         <HexValue name="matgloss_skip">0xC</HexValue>
         
+        <Address name="notes">0x09332C98</Address>
+        <Offset name="note_foreground">0x2</Offset>
+        <Offset name="note_background">0x4</Offset>
+        <Offset name="note_name">0x8</Offset>
+        <Offset name="note_xyz">0xC</Offset>
+        
+        <Address name="hotkey_start">0x0931EA8C</Address>
+        <Offset name="hotkey_mode">0x4</Offset>
+        <Offset name="hotkey_xyz">0x8</Offset>
+        <HexValue name="hotkey_size">0x14</HexValue>
+                
         <!-- virtual tables extracted from DF -->
         <VTable name="building_vtable">
             <class vtable="0x08797448" name="building_construction" />
@@ -1614,6 +1632,8 @@
         <VTable rebase="-0x5e360" name="building_vtable" />
         <Address name="cursor_xyz">0x88073d4</Address>
         <Address name="window_dims">0x9510050</Address>
+
+        <Address name="notes">0x092AB244</Address>
     </Entry>
     <!-- re-specified addresses here, offsets and hexvals remain same -->
     <Entry version="v0.28.181.40d12" os="linux" base="40d9lin" id="40d12lin">
@@ -1654,6 +1674,10 @@
         <Address name="matgloss">0x08F97A84</Address>
         <VTable rebase="-0xd6f00" name="building_vtable" />
         <!--<class vtable="0x086C3968" name="door"/>-->
+        
+        <Address name="notes">0x08F41644</Address>
+        <Address name="hotkey_start">0x08F4166C</Address>
+        
     </Entry>
     <Entry version="v0.28.181.40d13" os="linux" id="40d13lin" base="40d12lin" rebase="0x5020">
         <!-- identification -->
@@ -1911,6 +1935,9 @@
         <Address name="view_screen">0x878caa4</Address> <!-- address of ptr to view screen object, 'public gview' in IDA Pro -->
         <Address name="current_menu_state">0x8f4e940</Address> <!-- menu state - used to get out of menus with space key -->
         
+        <Address name="notes">0x08F4E7C4</Address>
+        <Address name="hotkey_start">0x08F4E7EC</Address>
+        
         <!--<VTable name="building_vtable" rebase="0xAE20" />--> <!-- Door: 0x86D26E8 -->
         <VTable name="viewscreen_vtable">
             <class vtable="0x086D5488" name="viewscreen_conversation" />

From f71fef9ef5703d00a74fd338790fd6ee64b57eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 19 Feb 2010 02:48:03 +0100
Subject: [PATCH 11/16] Process::readClassName implemented

---
 examples/veinlook.cpp             | 49 ++++++++++++++++++++++++-------
 library/DFProcess-linux-SHM.cpp   | 10 +++++++
 library/DFProcess-linux-wine.cpp  |  9 ++++++
 library/DFProcess-linux.cpp       | 10 +++++++
 library/DFProcess-windows-SHM.cpp |  9 ++++++
 library/DFProcess-windows.cpp     |  9 ++++++
 library/DFProcess.h               |  8 +++++
 7 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/examples/veinlook.cpp b/examples/veinlook.cpp
index 5e81803c4..4e138cad1 100644
--- a/examples/veinlook.cpp
+++ b/examples/veinlook.cpp
@@ -16,6 +16,7 @@ using namespace DFHack;
 #include <signal.h>
 
 string error;
+API * pDF = 0;
 
 static void finish(int sig);
 
@@ -185,9 +186,21 @@ int pickColor(int tiletype)
 
 string getGCCClassName (Process * p, uint32_t vptr)
 {
-    int typeinfo = p->readDWord(vptr - 4);
-    int typestring = p->readDWord(typeinfo + 4);
-    return p->readCString(typestring);
+    int typeinfo = p->readDWord(vptr - 0x4);
+    int typestring = p->readDWord(typeinfo + 0x4);
+    string raw = p->readCString(typestring);
+    size_t  start = raw.find_first_of("abcdefghijklmnopqrstuvwxyz");// trim numbers
+    size_t end = raw.length();
+    return raw.substr(start,end-start - 2); // trim the 'st' from the end
+}
+
+string getMSVCClassName (Process * p, uint32_t vptr)
+{
+    int rtti = p->readDWord(vptr - 0x4);
+    int typeinfo = p->readDWord(rtti + 0xC);
+    string raw = p->readCString(typeinfo + 0xC); // skips the .?AV
+    raw.resize(raw.length() - 4);// trim st@@ from end
+    return raw;
 }
 
 main(int argc, char *argv[])
@@ -241,17 +254,23 @@ main(int argc, char *argv[])
     
     // init the API
     DFHack::API DF("Memory.xml");
-    
+    pDF = &DF;
     // attach
     if(!DF.Attach())
     {
         error = "Can't find DF.";
+        pDF = 0;
         finish(0);
     }
     
     Process* p = DF.getProcess();
     // init the map
-    DF.InitMap();
+    if(!DF.InitMap())
+    {
+        error = "Can't find a map to look at.";
+        pDF = 0;
+        finish(0);
+    }
     
     DF.getSize(x_max_a,y_max_a,z_max_a);
     x_max = x_max_a;
@@ -262,6 +281,7 @@ main(int argc, char *argv[])
     if(!DF.ReadStoneMatgloss(stonetypes))
     {
         error = "Can't read stone types.";
+        pDF = 0;
         finish(0);
     }
     
@@ -269,6 +289,7 @@ main(int argc, char *argv[])
     if(!DF.ReadGeology( layerassign ))
     {
         error = "Can't read local geology.";
+        pDF = 0;
         finish(0);
     }
 
@@ -283,6 +304,7 @@ main(int argc, char *argv[])
     // walk the map!
     for (;;)
     {
+        DF.Resume();
         int c = getch();     /* refresh, accept single keystroke of input */
         clrscr();
         /* process the command keystroke */
@@ -371,8 +393,10 @@ main(int argc, char *argv[])
         {
             if(vein != -1 && vein < veinVector.size())
             {
-                string str = getGCCClassName(p, veinVector[vein].vtable);
-                if(str == "34block_square_event_frozen_liquidst")
+                //string str = getGCCClassName(p, veinVector[vein].vtable);
+                string className = p->readClassName(veinVector[vein].vtable);
+                //string str = "34block_square_event_frozen_liquidst";
+                if(className == "block_square_event_frozen_liquid")
                 {
                     t_frozenliquidvein frozen;
                     uint32_t size = sizeof(t_frozenliquidvein);
@@ -391,7 +415,7 @@ main(int argc, char *argv[])
                         }
                     }
                 }
-                else if (str == "28block_square_event_mineralst")
+                else if (className == "block_square_event_mineral")
                 {
                     //iterate through vein rows
                     for(uint32_t j = 0;j<16;j++)
@@ -411,17 +435,22 @@ main(int argc, char *argv[])
                     cprintf("%s",stonetypes[veinVector[vein].type].name);
                 }
                 gotoxy(0,51);
-                cprintf("%s, address 0x%x",str.c_str(),veinVector[vein].address_of);
+                cprintf("%s, address 0x%x",className.c_str(),veinVector[vein].address_of);
             }
         }
-        DF.Resume();
         wrefresh(stdscr);
     }
+    pDF = 0;
     finish(0);
 }
 
 static void finish(int sig)
 {
+    // ugly
+    if(pDF)
+    {
+        pDF->Detach();
+    }
     endwin();
     if(!error.empty())
     {
diff --git a/library/DFProcess-linux-SHM.cpp b/library/DFProcess-linux-SHM.cpp
index 3c729f790..5821e129c 100644
--- a/library/DFProcess-linux-SHM.cpp
+++ b/library/DFProcess-linux-SHM.cpp
@@ -636,4 +636,14 @@ void SHMProcess::writeSTLString(const uint32_t address, const std::string writeS
     full_barrier
     ((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_STL_STRING;
     d->waitWhile(DFPP_WRITE_STL_STRING);
+}
+
+string SHMProcess::readClassName (uint32_t vptr)
+{
+    int typeinfo = readDWord(vptr - 0x4);
+    int typestring = readDWord(typeinfo + 0x4);
+    string raw = readCString(typestring);
+    size_t  start = raw.find_first_of("abcdefghijklmnopqrstuvwxyz");// trim numbers
+    size_t end = raw.length();
+    return raw.substr(start,end-start - 2); // trim the 'st' from the end
 }
\ No newline at end of file
diff --git a/library/DFProcess-linux-wine.cpp b/library/DFProcess-linux-wine.cpp
index 24cc71cc8..f4b6d670e 100644
--- a/library/DFProcess-linux-wine.cpp
+++ b/library/DFProcess-linux-wine.cpp
@@ -581,4 +581,13 @@ const string WineProcess::readSTLString (uint32_t offset)
     string ret = temp;
     delete temp;
     return ret;
+}
+
+string WineProcess::readClassName (uint32_t vptr)
+{
+    int rtti = readDWord(vptr - 0x4);
+    int typeinfo = readDWord(rtti + 0xC);
+    string raw = readCString(typeinfo + 0xC); // skips the .?AV
+    raw.resize(raw.length() - 4);// trim st@@ from end
+    return raw;
 }
\ No newline at end of file
diff --git a/library/DFProcess-linux.cpp b/library/DFProcess-linux.cpp
index 5bda864a6..7801520ba 100644
--- a/library/DFProcess-linux.cpp
+++ b/library/DFProcess-linux.cpp
@@ -526,4 +526,14 @@ const string NormalProcess::readSTLString (uint32_t offset)
     string ret(temp);
     delete temp;
     return ret;
+}
+
+string NormalProcess::readClassName (uint32_t vptr)
+{
+    int typeinfo = readDWord(vptr - 0x4);
+    int typestring = readDWord(typeinfo + 0x4);
+    string raw = readCString(typestring);
+    size_t  start = raw.find_first_of("abcdefghijklmnopqrstuvwxyz");// trim numbers
+    size_t end = raw.length();
+    return raw.substr(start,end-start - 2); // trim the 'st' from the end
 }
\ No newline at end of file
diff --git a/library/DFProcess-windows-SHM.cpp b/library/DFProcess-windows-SHM.cpp
index bccca900c..ec10171dd 100644
--- a/library/DFProcess-windows-SHM.cpp
+++ b/library/DFProcess-windows-SHM.cpp
@@ -723,4 +723,13 @@ void SHMProcess::writeSTLString(const uint32_t address, const std::string writeS
     full_barrier
     ((shm_write_small *)d->my_shm)->pingpong = DFPP_WRITE_STL_STRING;
     d->waitWhile(DFPP_WRITE_STL_STRING);
+}
+
+string SHMProcess::readClassName (uint32_t vptr)
+{
+    int rtti = readDWord(vptr - 0x4);
+    int typeinfo = readDWord(rtti + 0xC);
+    string raw = readCString(typeinfo + 0xC); // skips the .?AV
+    raw.resize(raw.length() - 4);// trim st@@ from end
+    return raw;
 }
\ No newline at end of file
diff --git a/library/DFProcess-windows.cpp b/library/DFProcess-windows.cpp
index f1780f474..21b4a5b67 100644
--- a/library/DFProcess-windows.cpp
+++ b/library/DFProcess-windows.cpp
@@ -463,4 +463,13 @@ const string NormalProcess::readSTLString (uint32_t offset)
     string ret = temp;
     delete temp;
     return ret;
+}
+
+string NormalProcess::readClassName (uint32_t vptr)
+{
+    int rtti = readDWord(vptr - 0x4);
+    int typeinfo = readDWord(rtti + 0xC);
+    string raw = readCString(typeinfo + 0xC); // skips the .?AV
+    raw.resize(raw.length() - 4);// trim st@@ from end
+    return raw;
 }
\ No newline at end of file
diff --git a/library/DFProcess.h b/library/DFProcess.h
index 19acbbecd..a48f0d7b3 100644
--- a/library/DFProcess.h
+++ b/library/DFProcess.h
@@ -96,6 +96,8 @@ namespace DFHack
             virtual void writeSTLString(const uint32_t address, const std::string writeString) = 0;
             // read a vector from memory
             virtual DfVector readVector (uint32_t offset, uint32_t item_size) = 0;
+            // get class name of an object with rtti/type info
+            virtual string readClassName(uint32_t vptr) = 0;
             
             virtual const std::string readCString (uint32_t offset) = 0;
             
@@ -152,6 +154,8 @@ namespace DFHack
             void writeSTLString(const uint32_t address, const std::string writeString){};
             // read a vector from memory
             DfVector readVector (uint32_t offset, uint32_t item_size);
+            // get class name of an object with rtti/type info
+            string readClassName(uint32_t vptr);
             
             const std::string readCString (uint32_t offset);
             
@@ -203,6 +207,8 @@ namespace DFHack
             void writeSTLString(const uint32_t address, const std::string writeString);
             // read a vector from memory
             DfVector readVector (uint32_t offset, uint32_t item_size);
+            // get class name of an object with rtti/type info
+            string readClassName(uint32_t vptr);
             
             const std::string readCString (uint32_t offset);
             
@@ -254,6 +260,8 @@ namespace DFHack
             void writeSTLString(const uint32_t address, const std::string writeString){};
             // read a vector from memory
             DfVector readVector (uint32_t offset, uint32_t item_size);
+            // get class name of an object with rtti/type info
+            string readClassName(uint32_t vptr);
             
             const std::string readCString (uint32_t offset);
             

From 544e37f183c10e623c614607f6b203e87aeb4740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 19 Feb 2010 03:37:16 +0100
Subject: [PATCH 12/16] ForceResume DF on exit of veinlook

---
 examples/veinlook.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/veinlook.cpp b/examples/veinlook.cpp
index 4e138cad1..a8ee0bd87 100644
--- a/examples/veinlook.cpp
+++ b/examples/veinlook.cpp
@@ -449,6 +449,7 @@ static void finish(int sig)
     // ugly
     if(pDF)
     {
+        pDF->ForceResume();
         pDF->Detach();
     }
     endwin();

From a679b26f94220fc1ea9c96147f869f8f9b5f7732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 19 Feb 2010 03:58:40 +0100
Subject: [PATCH 13/16] Fix note address on Linux

---
 output/Memory.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/output/Memory.xml b/output/Memory.xml
index ad3601644..91c4d9e71 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1520,7 +1520,8 @@
         <Address name="matgloss">0x9374E88</Address>
         <HexValue name="matgloss_skip">0xC</HexValue>
         
-        <Address name="notes">0x09332C98</Address>
+        <!--<Address name="notes">0x09332C98</Address>-->
+        <Address name="notes">0x0931EA64</Address>
         <Offset name="note_foreground">0x2</Offset>
         <Offset name="note_background">0x4</Offset>
         <Offset name="note_name">0x8</Offset>

From e31f5a297327fd4cd299901981d93cd6dd780453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 19 Feb 2010 05:28:54 +0100
Subject: [PATCH 14/16] Less SHM terminal spam

---
 shmserver/shms-proto.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shmserver/shms-proto.cpp b/shmserver/shms-proto.cpp
index 25b5810c9..ded5a4959 100644
--- a/shmserver/shms-proto.cpp
+++ b/shmserver/shms-proto.cpp
@@ -158,7 +158,7 @@ void SHM_Act (void)
             
         case DFPP_CL_ERROR:
         case DFPP_RUNNING:
-            fprintf(stderr, "no. of waits: %d\n", numwaits);
+            //fprintf(stderr, "no. of waits: %d\n", numwaits);
             //MessageBox(0,"Broke out of loop properly","FUN", MB_OK);
             break;
 

From c827cb6dfc1ee7acaf82f369ae2c3be0900f6e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 19 Feb 2010 12:37:51 +0100
Subject: [PATCH 15/16] Reduce chaos in precompiled SHM libs

---
 {shmserver => precompiled/linux}/df-hacked |   3 +--
 precompiled/{ => linux}/libdfconnect.so    | Bin
 precompiled/{ => windows}/SDL.dll          | Bin
 shmserver/dfconnect.so                     | Bin 12100 -> 0 bytes
 4 files changed, 1 insertion(+), 2 deletions(-)
 rename {shmserver => precompiled/linux}/df-hacked (89%)
 rename precompiled/{ => linux}/libdfconnect.so (100%)
 rename precompiled/{ => windows}/SDL.dll (100%)
 delete mode 100755 shmserver/dfconnect.so

diff --git a/shmserver/df-hacked b/precompiled/linux/df-hacked
similarity index 89%
rename from shmserver/df-hacked
rename to precompiled/linux/df-hacked
index bf56b33e2..f9c3a3351 100755
--- a/shmserver/df-hacked
+++ b/precompiled/linux/df-hacked
@@ -9,6 +9,5 @@ if [ $? -eq 0 ]; then
  mv libs/libSDL* unused_libs/
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./libs" # Update library search path.
-export LD_PRELOAD="./libs/dfconnect.so" # Hack DF!
+export LD_PRELOAD="./libs/libdfconnect.so" # Hack DF!
 ./dwarfort.exe $* # Go, go, go! :)
-
diff --git a/precompiled/libdfconnect.so b/precompiled/linux/libdfconnect.so
similarity index 100%
rename from precompiled/libdfconnect.so
rename to precompiled/linux/libdfconnect.so
diff --git a/precompiled/SDL.dll b/precompiled/windows/SDL.dll
similarity index 100%
rename from precompiled/SDL.dll
rename to precompiled/windows/SDL.dll
diff --git a/shmserver/dfconnect.so b/shmserver/dfconnect.so
deleted file mode 100755
index ee1579718e289fc9840a34cebd427f5df61230f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12100
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


From 88cb312a65abe3de3cdc9b707b06bcb9fb10d64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 20 Feb 2010 01:12:55 +0100
Subject: [PATCH 16/16] Added block dump function to veinlook

---
 examples/veinlook.cpp | 89 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 73 insertions(+), 16 deletions(-)

diff --git a/examples/veinlook.cpp b/examples/veinlook.cpp
index a8ee0bd87..7084f1092 100644
--- a/examples/veinlook.cpp
+++ b/examples/veinlook.cpp
@@ -1,7 +1,9 @@
 #include <integers.h>
 #include <string.h> // for memset
 #include <string>
+#include <fstream>
 #include <iostream>
+#include <iomanip>
 #include <vector>
 #include <map>
 using namespace std;
@@ -182,27 +184,52 @@ int pickColor(int tiletype)
         case FIRE:
             return COLOR_RED;
     }
-}
 
-string getGCCClassName (Process * p, uint32_t vptr)
-{
-    int typeinfo = p->readDWord(vptr - 0x4);
-    int typestring = p->readDWord(typeinfo + 0x4);
-    string raw = p->readCString(typestring);
-    size_t  start = raw.find_first_of("abcdefghijklmnopqrstuvwxyz");// trim numbers
-    size_t end = raw.length();
-    return raw.substr(start,end-start - 2); // trim the 'st' from the end
 }
 
-string getMSVCClassName (Process * p, uint32_t vptr)
+/*
+address = absolute address of dump start
+length = length in bytes
+*/
+void hexdump (DFHack::API& DF, uint32_t address, uint32_t length, int filenum)
 {
-    int rtti = p->readDWord(vptr - 0x4);
-    int typeinfo = p->readDWord(rtti + 0xC);
-    string raw = p->readCString(typeinfo + 0xC); // skips the .?AV
-    raw.resize(raw.length() - 4);// trim st@@ from end
-    return raw;
+    uint32_t reallength;
+    uint32_t lines;
+    lines = (length / 16) + 1;
+    reallength = lines * 16;
+    char *buf = new char[reallength];
+    ofstream myfile;
+    
+    string name = "hexdump";
+    name += filenum;
+    name+= ".txt";
+    
+    myfile.open (name.c_str());
+    
+    DF.ReadRaw(address, reallength, (uint8_t *) buf);
+    for (int i = 0; i < lines; i++)
+    {
+        // leading offset
+        myfile << "0x" << hex << setw(4) << i*16 << " ";
+        // groups
+        for(int j = 0; j < 4; j++)
+        {
+            // bytes
+            for(int k = 0; k < 4; k++)
+            {
+                int idx = i * 16 + j * 4 + k;
+                
+                myfile << hex << setw(2) << int(static_cast<unsigned char>(buf[idx])) << " ";
+            }
+            myfile << " ";
+        }
+        myfile << endl;
+    }
+    delete buf;
+    myfile.close();
 }
 
+
 main(int argc, char *argv[])
 {
     /* initialize your non-curses data structures here */
@@ -299,11 +326,16 @@ main(int argc, char *argv[])
     int cursorZ = z_max/2 - 1;
     
     
-    
+    bool dig = false;
+    bool dump = false;
     int vein = 0;
+    int filenum = 0;
+    uint32_t blockaddr = 0;
     // walk the map!
     for (;;)
     {
+        dig = false;
+        dump = false;
         DF.Resume();
         int c = getch();     /* refresh, accept single keystroke of input */
         clrscr();
@@ -331,6 +363,12 @@ main(int argc, char *argv[])
             case '+':
                 vein ++;
                 break;
+            case 'd':
+                dig = true;
+                break;
+            case 'o':
+                dump = true;
+                break;
             case '-':
                 vein --;
                 break;
@@ -359,6 +397,14 @@ main(int argc, char *argv[])
                     {
                         for(int y = 0; y < 16; y++)
                         {
+                            if(dig)
+                            {
+                                if(tileTypeTable[tiletypes[x][y]].c == WALL && tileTypeTable[tiletypes[x][y]].m == VEIN
+                                    || tileTypeTable[tiletypes[x][y]].c == TREE_OK || tileTypeTable[tiletypes[x][y]].c == TREE_DEAD)
+                                {
+                                    designations[x][y].bits.dig = designation_default;
+                                }
+                            }
                             int color = COLOR_BLACK;
                             color = pickColor(tiletypes[x][y]);
                             if(designations[x][y].bits.hidden)
@@ -373,8 +419,17 @@ main(int argc, char *argv[])
                             }
                         }
                     }
+                    
                     if(i == 0 && j == 0)
                     {
+                        blockaddr = DF.getBlockPtr(cursorX+i,cursorY+j,cursorZ);
+                        if(dump)
+                        {
+                            hexdump(DF,blockaddr,0x1DB8,filenum);
+                            filenum++;
+                        }
+                        if(dig)
+                            DF.WriteDesignations(cursorX+i,cursorY+j,cursorZ, (uint32_t *) designations);
                         veinVector.clear();
                         DF.ReadVeins(cursorX+i,cursorY+j,cursorZ,veinVector);
                     }
@@ -438,6 +493,8 @@ main(int argc, char *argv[])
                 cprintf("%s, address 0x%x",className.c_str(),veinVector[vein].address_of);
             }
         }
+        gotoxy (0,53);
+        cprintf("block address 0x%x",blockaddr);
         wrefresh(stdscr);
     }
     pDF = 0;