From c26da9b84c186afc88f85bd42bfc179b9684eaf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 2 Apr 2010 16:46:33 +0200
Subject: [PATCH] More DF 2010 reorganization

---
 CMakeLists.txt                                  |  4 ++--
 {library => dfhack}/CMakeLists.txt              |  2 +-
 {library => dfhack}/DFCommonInternal.h          |  0
 {library => dfhack}/DFError.h                   |  0
 {library => dfhack}/DFHackAPI.cpp               |  0
 {library => dfhack}/DFHackAPI.h                 |  0
 {library => dfhack}/DFMemInfo.cpp               |  0
 {library => dfhack}/DFMemInfo.h                 |  0
 {library => dfhack}/DFMemInfoManager.cpp        |  0
 {library => dfhack}/DFMemInfoManager.h          |  0
 {library => dfhack}/DFProcess-linux-SHM.cpp     |  0
 {library => dfhack}/DFProcess-linux-wine.cpp    |  0
 {library => dfhack}/DFProcess-linux.cpp         |  0
 {library => dfhack}/DFProcess-windows-SHM.cpp   |  0
 {library => dfhack}/DFProcess-windows.cpp       |  0
 {library => dfhack}/DFProcess.h                 |  0
 .../DFProcessEnumerator-linux.cpp               |  0
 .../DFProcessEnumerator-windows.cpp             |  0
 {library => dfhack}/DFProcessEnumerator.h       |  0
 {library => dfhack}/DFTileTypes.cpp             |  0
 {library => dfhack}/DFTileTypes.h               |  0
 {library => dfhack}/DFTypes.h                   |  0
 {library => dfhack}/DFVector.cpp                |  0
 {library => dfhack}/DFVector.h                  |  0
 {library => dfhack}/DFWindow-linux.cpp          |  0
 {library => dfhack}/DFWindow-windows.cpp        |  0
 {library => dfhack}/DFWindow.h                  |  0
 {library => dfhack}/Export.h                    |  0
 {library => dfhack}/Tranquility.h               |  0
 {library => dfhack}/argstream/argstream.h       |  0
 {library => dfhack}/config.h.cmake              |  0
 {library => dfhack}/integers.h                  |  0
 {library => dfhack}/md5/md5.cpp                 |  0
 {library => dfhack}/md5/md5.h                   |  0
 {library => dfhack}/md5/md5wrapper.cpp          |  0
 {library => dfhack}/md5/md5wrapper.h            |  0
 {library => dfhack}/pydfhack.i                  |  0
 {library => dfhack}/stdint_win.h                |  0
 {library => dfhack}/tinyxml/tinystr.cpp         |  0
 {library => dfhack}/tinyxml/tinystr.h           |  0
 {library => dfhack}/tinyxml/tinyxml.cpp         |  0
 {library => dfhack}/tinyxml/tinyxml.h           |  0
 {library => dfhack}/tinyxml/tinyxmlerror.cpp    |  0
 {library => dfhack}/tinyxml/tinyxmlparser.cpp   |  0
 {library => dfhack}/unmaintained/DFHackAPIc.cpp |  0
 {library => dfhack}/unmaintained/DFHackAPIc.h   |  0
 .../unmaintained/LinuxMemAccess-ptrace.h        |  0
 .../unmaintained/TileTypeLeftovers.cpp          |  0
 output/Memory.xml                               | 17 +++++++++++++++++
 49 files changed, 20 insertions(+), 3 deletions(-)
 rename {library => dfhack}/CMakeLists.txt (96%)
 rename {library => dfhack}/DFCommonInternal.h (100%)
 rename {library => dfhack}/DFError.h (100%)
 rename {library => dfhack}/DFHackAPI.cpp (100%)
 rename {library => dfhack}/DFHackAPI.h (100%)
 rename {library => dfhack}/DFMemInfo.cpp (100%)
 rename {library => dfhack}/DFMemInfo.h (100%)
 rename {library => dfhack}/DFMemInfoManager.cpp (100%)
 rename {library => dfhack}/DFMemInfoManager.h (100%)
 rename {library => dfhack}/DFProcess-linux-SHM.cpp (100%)
 rename {library => dfhack}/DFProcess-linux-wine.cpp (100%)
 rename {library => dfhack}/DFProcess-linux.cpp (100%)
 rename {library => dfhack}/DFProcess-windows-SHM.cpp (100%)
 rename {library => dfhack}/DFProcess-windows.cpp (100%)
 rename {library => dfhack}/DFProcess.h (100%)
 rename {library => dfhack}/DFProcessEnumerator-linux.cpp (100%)
 rename {library => dfhack}/DFProcessEnumerator-windows.cpp (100%)
 rename {library => dfhack}/DFProcessEnumerator.h (100%)
 rename {library => dfhack}/DFTileTypes.cpp (100%)
 rename {library => dfhack}/DFTileTypes.h (100%)
 rename {library => dfhack}/DFTypes.h (100%)
 rename {library => dfhack}/DFVector.cpp (100%)
 rename {library => dfhack}/DFVector.h (100%)
 rename {library => dfhack}/DFWindow-linux.cpp (100%)
 rename {library => dfhack}/DFWindow-windows.cpp (100%)
 rename {library => dfhack}/DFWindow.h (100%)
 rename {library => dfhack}/Export.h (100%)
 rename {library => dfhack}/Tranquility.h (100%)
 rename {library => dfhack}/argstream/argstream.h (100%)
 rename {library => dfhack}/config.h.cmake (100%)
 rename {library => dfhack}/integers.h (100%)
 rename {library => dfhack}/md5/md5.cpp (100%)
 rename {library => dfhack}/md5/md5.h (100%)
 rename {library => dfhack}/md5/md5wrapper.cpp (100%)
 rename {library => dfhack}/md5/md5wrapper.h (100%)
 rename {library => dfhack}/pydfhack.i (100%)
 rename {library => dfhack}/stdint_win.h (100%)
 rename {library => dfhack}/tinyxml/tinystr.cpp (100%)
 rename {library => dfhack}/tinyxml/tinystr.h (100%)
 rename {library => dfhack}/tinyxml/tinyxml.cpp (100%)
 rename {library => dfhack}/tinyxml/tinyxml.h (100%)
 rename {library => dfhack}/tinyxml/tinyxmlerror.cpp (100%)
 rename {library => dfhack}/tinyxml/tinyxmlparser.cpp (100%)
 rename {library => dfhack}/unmaintained/DFHackAPIc.cpp (100%)
 rename {library => dfhack}/unmaintained/DFHackAPIc.h (100%)
 rename {library => dfhack}/unmaintained/LinuxMemAccess-ptrace.h (100%)
 rename {library => dfhack}/unmaintained/TileTypeLeftovers.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de66d3c76..be6e0abcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,11 +26,11 @@ SET( LIBRARY_OUTPUT_PATH ${dfhack_SOURCE_DIR}/output CACHE PATH "Output director
 SET( EXECUTABLE_OUTPUT_PATH ${dfhack_SOURCE_DIR}/output CACHE PATH "Output directory for the dfhack tools" )
 SET( CMAKE_SWIG_OUTDIR ${dfhack_SOURCE_DIR}/output CACHE PATH "Global output directory for swig generated language wrappers" )
 
-include_directories (${CMAKE_SOURCE_DIR}/library/)
+include_directories (${CMAKE_SOURCE_DIR}/dfhack/)
 include_directories (${CMAKE_SOURCE_DIR}/shmserver/)
 include_directories (${CMAKE_SOURCE_DIR}/depends/)
 
-add_subdirectory (library)
+add_subdirectory (dfhack)
 add_subdirectory (tools)
 add_subdirectory (examples)
 add_subdirectory (shmserver)
\ No newline at end of file
diff --git a/library/CMakeLists.txt b/dfhack/CMakeLists.txt
similarity index 96%
rename from library/CMakeLists.txt
rename to dfhack/CMakeLists.txt
index 321ef5b3b..5761d4645 100644
--- a/library/CMakeLists.txt
+++ b/dfhack/CMakeLists.txt
@@ -79,7 +79,7 @@ SET( MEMXML_DATA_PATH . CACHE PATH "search path for Memory.xml")
 #OPTION( WITH_BAR "Enable BAR component" OFF )
 
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/library/config.h.cmake ${CMAKE_SOURCE_DIR}/library/config.h )
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/dfhack/config.h.cmake ${CMAKE_SOURCE_DIR}/dfhack/config.h )
 
 
 
diff --git a/library/DFCommonInternal.h b/dfhack/DFCommonInternal.h
similarity index 100%
rename from library/DFCommonInternal.h
rename to dfhack/DFCommonInternal.h
diff --git a/library/DFError.h b/dfhack/DFError.h
similarity index 100%
rename from library/DFError.h
rename to dfhack/DFError.h
diff --git a/library/DFHackAPI.cpp b/dfhack/DFHackAPI.cpp
similarity index 100%
rename from library/DFHackAPI.cpp
rename to dfhack/DFHackAPI.cpp
diff --git a/library/DFHackAPI.h b/dfhack/DFHackAPI.h
similarity index 100%
rename from library/DFHackAPI.h
rename to dfhack/DFHackAPI.h
diff --git a/library/DFMemInfo.cpp b/dfhack/DFMemInfo.cpp
similarity index 100%
rename from library/DFMemInfo.cpp
rename to dfhack/DFMemInfo.cpp
diff --git a/library/DFMemInfo.h b/dfhack/DFMemInfo.h
similarity index 100%
rename from library/DFMemInfo.h
rename to dfhack/DFMemInfo.h
diff --git a/library/DFMemInfoManager.cpp b/dfhack/DFMemInfoManager.cpp
similarity index 100%
rename from library/DFMemInfoManager.cpp
rename to dfhack/DFMemInfoManager.cpp
diff --git a/library/DFMemInfoManager.h b/dfhack/DFMemInfoManager.h
similarity index 100%
rename from library/DFMemInfoManager.h
rename to dfhack/DFMemInfoManager.h
diff --git a/library/DFProcess-linux-SHM.cpp b/dfhack/DFProcess-linux-SHM.cpp
similarity index 100%
rename from library/DFProcess-linux-SHM.cpp
rename to dfhack/DFProcess-linux-SHM.cpp
diff --git a/library/DFProcess-linux-wine.cpp b/dfhack/DFProcess-linux-wine.cpp
similarity index 100%
rename from library/DFProcess-linux-wine.cpp
rename to dfhack/DFProcess-linux-wine.cpp
diff --git a/library/DFProcess-linux.cpp b/dfhack/DFProcess-linux.cpp
similarity index 100%
rename from library/DFProcess-linux.cpp
rename to dfhack/DFProcess-linux.cpp
diff --git a/library/DFProcess-windows-SHM.cpp b/dfhack/DFProcess-windows-SHM.cpp
similarity index 100%
rename from library/DFProcess-windows-SHM.cpp
rename to dfhack/DFProcess-windows-SHM.cpp
diff --git a/library/DFProcess-windows.cpp b/dfhack/DFProcess-windows.cpp
similarity index 100%
rename from library/DFProcess-windows.cpp
rename to dfhack/DFProcess-windows.cpp
diff --git a/library/DFProcess.h b/dfhack/DFProcess.h
similarity index 100%
rename from library/DFProcess.h
rename to dfhack/DFProcess.h
diff --git a/library/DFProcessEnumerator-linux.cpp b/dfhack/DFProcessEnumerator-linux.cpp
similarity index 100%
rename from library/DFProcessEnumerator-linux.cpp
rename to dfhack/DFProcessEnumerator-linux.cpp
diff --git a/library/DFProcessEnumerator-windows.cpp b/dfhack/DFProcessEnumerator-windows.cpp
similarity index 100%
rename from library/DFProcessEnumerator-windows.cpp
rename to dfhack/DFProcessEnumerator-windows.cpp
diff --git a/library/DFProcessEnumerator.h b/dfhack/DFProcessEnumerator.h
similarity index 100%
rename from library/DFProcessEnumerator.h
rename to dfhack/DFProcessEnumerator.h
diff --git a/library/DFTileTypes.cpp b/dfhack/DFTileTypes.cpp
similarity index 100%
rename from library/DFTileTypes.cpp
rename to dfhack/DFTileTypes.cpp
diff --git a/library/DFTileTypes.h b/dfhack/DFTileTypes.h
similarity index 100%
rename from library/DFTileTypes.h
rename to dfhack/DFTileTypes.h
diff --git a/library/DFTypes.h b/dfhack/DFTypes.h
similarity index 100%
rename from library/DFTypes.h
rename to dfhack/DFTypes.h
diff --git a/library/DFVector.cpp b/dfhack/DFVector.cpp
similarity index 100%
rename from library/DFVector.cpp
rename to dfhack/DFVector.cpp
diff --git a/library/DFVector.h b/dfhack/DFVector.h
similarity index 100%
rename from library/DFVector.h
rename to dfhack/DFVector.h
diff --git a/library/DFWindow-linux.cpp b/dfhack/DFWindow-linux.cpp
similarity index 100%
rename from library/DFWindow-linux.cpp
rename to dfhack/DFWindow-linux.cpp
diff --git a/library/DFWindow-windows.cpp b/dfhack/DFWindow-windows.cpp
similarity index 100%
rename from library/DFWindow-windows.cpp
rename to dfhack/DFWindow-windows.cpp
diff --git a/library/DFWindow.h b/dfhack/DFWindow.h
similarity index 100%
rename from library/DFWindow.h
rename to dfhack/DFWindow.h
diff --git a/library/Export.h b/dfhack/Export.h
similarity index 100%
rename from library/Export.h
rename to dfhack/Export.h
diff --git a/library/Tranquility.h b/dfhack/Tranquility.h
similarity index 100%
rename from library/Tranquility.h
rename to dfhack/Tranquility.h
diff --git a/library/argstream/argstream.h b/dfhack/argstream/argstream.h
similarity index 100%
rename from library/argstream/argstream.h
rename to dfhack/argstream/argstream.h
diff --git a/library/config.h.cmake b/dfhack/config.h.cmake
similarity index 100%
rename from library/config.h.cmake
rename to dfhack/config.h.cmake
diff --git a/library/integers.h b/dfhack/integers.h
similarity index 100%
rename from library/integers.h
rename to dfhack/integers.h
diff --git a/library/md5/md5.cpp b/dfhack/md5/md5.cpp
similarity index 100%
rename from library/md5/md5.cpp
rename to dfhack/md5/md5.cpp
diff --git a/library/md5/md5.h b/dfhack/md5/md5.h
similarity index 100%
rename from library/md5/md5.h
rename to dfhack/md5/md5.h
diff --git a/library/md5/md5wrapper.cpp b/dfhack/md5/md5wrapper.cpp
similarity index 100%
rename from library/md5/md5wrapper.cpp
rename to dfhack/md5/md5wrapper.cpp
diff --git a/library/md5/md5wrapper.h b/dfhack/md5/md5wrapper.h
similarity index 100%
rename from library/md5/md5wrapper.h
rename to dfhack/md5/md5wrapper.h
diff --git a/library/pydfhack.i b/dfhack/pydfhack.i
similarity index 100%
rename from library/pydfhack.i
rename to dfhack/pydfhack.i
diff --git a/library/stdint_win.h b/dfhack/stdint_win.h
similarity index 100%
rename from library/stdint_win.h
rename to dfhack/stdint_win.h
diff --git a/library/tinyxml/tinystr.cpp b/dfhack/tinyxml/tinystr.cpp
similarity index 100%
rename from library/tinyxml/tinystr.cpp
rename to dfhack/tinyxml/tinystr.cpp
diff --git a/library/tinyxml/tinystr.h b/dfhack/tinyxml/tinystr.h
similarity index 100%
rename from library/tinyxml/tinystr.h
rename to dfhack/tinyxml/tinystr.h
diff --git a/library/tinyxml/tinyxml.cpp b/dfhack/tinyxml/tinyxml.cpp
similarity index 100%
rename from library/tinyxml/tinyxml.cpp
rename to dfhack/tinyxml/tinyxml.cpp
diff --git a/library/tinyxml/tinyxml.h b/dfhack/tinyxml/tinyxml.h
similarity index 100%
rename from library/tinyxml/tinyxml.h
rename to dfhack/tinyxml/tinyxml.h
diff --git a/library/tinyxml/tinyxmlerror.cpp b/dfhack/tinyxml/tinyxmlerror.cpp
similarity index 100%
rename from library/tinyxml/tinyxmlerror.cpp
rename to dfhack/tinyxml/tinyxmlerror.cpp
diff --git a/library/tinyxml/tinyxmlparser.cpp b/dfhack/tinyxml/tinyxmlparser.cpp
similarity index 100%
rename from library/tinyxml/tinyxmlparser.cpp
rename to dfhack/tinyxml/tinyxmlparser.cpp
diff --git a/library/unmaintained/DFHackAPIc.cpp b/dfhack/unmaintained/DFHackAPIc.cpp
similarity index 100%
rename from library/unmaintained/DFHackAPIc.cpp
rename to dfhack/unmaintained/DFHackAPIc.cpp
diff --git a/library/unmaintained/DFHackAPIc.h b/dfhack/unmaintained/DFHackAPIc.h
similarity index 100%
rename from library/unmaintained/DFHackAPIc.h
rename to dfhack/unmaintained/DFHackAPIc.h
diff --git a/library/unmaintained/LinuxMemAccess-ptrace.h b/dfhack/unmaintained/LinuxMemAccess-ptrace.h
similarity index 100%
rename from library/unmaintained/LinuxMemAccess-ptrace.h
rename to dfhack/unmaintained/LinuxMemAccess-ptrace.h
diff --git a/library/unmaintained/TileTypeLeftovers.cpp b/dfhack/unmaintained/TileTypeLeftovers.cpp
similarity index 100%
rename from library/unmaintained/TileTypeLeftovers.cpp
rename to dfhack/unmaintained/TileTypeLeftovers.cpp
diff --git a/output/Memory.xml b/output/Memory.xml
index 8cc7534d5..b6d5ce1f5 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1991,8 +1991,10 @@
       <HexValue name="pe_timestamp">0x4BB45F99</HexValue>
       
       <!-- basic stuff -->
+      <HexValue name="sizeof_vector">0x18</HexValue>
       <Offset name="hacked_vector_start">0x0</Offset>
       <Offset name="hacked_vector_triplet">0xC</Offset>
+      <HexValue name="sizeof_string">0x1C</HexValue>
       
       <!-- dfposition -->
       <Address name="window_x">0xe32798</Address>
@@ -2036,6 +2038,21 @@
       <Offset name="v_vein">0x10</Offset>
       <Offset name="type">0x0092</Offset>
       <Offset name="designation">0x029C</Offset>
+      
+      <!-- name struct -->
+      <Offset name="name_firstname">0x0</Offset>
+      <Offset name="name_nickname">0x1C</Offset>
+      <Offset name="name_words">0x38</Offset>
+      
+      <!-- Creatures -->
+      <Offset name="creature_name">0x0</Offset>
+      <Offset name="creature_position">0x90</Offset>
+      <Offset name="creature_flags1">0xF8</Offset>
+      <Offset name="creature_flags2">0xFC</Offset>
+      <Offset name="creature_sex">0x110</Offset>
+      <Offset name="creature_id">0x114</Offset>
+      <Offset name="creature_artifact_name">0x6D0</Offset>
+      <Offset name="creature_labors">0x770</Offset>
       <!--
       No idea if those are still relevant. I'll assume NO
       <Offset name="occupancy">0x0684</Offset>