More DF 2010 reorganization

2010-04-02 16:46:33 +02:00 · 2010-04-02 16:46:33 +02:00 · c26da9b84c
parent c503808a82
commit c26da9b84c
49 changed files with 20 additions and 3 deletions
--- 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)
--- a/library/CMakeLists.txt
+++ b/library/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 )



--- a/library/DFCommonInternal.h
+++ b/library/DFCommonInternal.h
--- a/library/DFError.h
+++ b/library/DFError.h
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
--- a/library/DFHackAPI.h
+++ b/library/DFHackAPI.h
--- a/library/DFMemInfo.cpp
+++ b/library/DFMemInfo.cpp
--- a/library/DFMemInfo.h
+++ b/library/DFMemInfo.h
--- a/library/DFMemInfoManager.cpp
+++ b/library/DFMemInfoManager.cpp
--- a/library/DFMemInfoManager.h
+++ b/library/DFMemInfoManager.h
--- a/library/DFProcess-linux-SHM.cpp
+++ b/library/DFProcess-linux-SHM.cpp
--- a/library/DFProcess-linux-wine.cpp
+++ b/library/DFProcess-linux-wine.cpp
--- a/library/DFProcess-linux.cpp
+++ b/library/DFProcess-linux.cpp
--- a/library/DFProcess-windows-SHM.cpp
+++ b/library/DFProcess-windows-SHM.cpp
--- a/library/DFProcess-windows.cpp
+++ b/library/DFProcess-windows.cpp
--- a/library/DFProcess.h
+++ b/library/DFProcess.h
--- a/library/DFProcessEnumerator-linux.cpp
+++ b/library/DFProcessEnumerator-linux.cpp
--- a/library/DFProcessEnumerator-windows.cpp
+++ b/library/DFProcessEnumerator-windows.cpp
--- a/library/DFProcessEnumerator.h
+++ b/library/DFProcessEnumerator.h
--- a/library/DFTileTypes.cpp
+++ b/library/DFTileTypes.cpp
--- a/library/DFTileTypes.h
+++ b/library/DFTileTypes.h
--- a/library/DFTypes.h
+++ b/library/DFTypes.h
--- a/library/DFVector.cpp
+++ b/library/DFVector.cpp
--- a/library/DFVector.h
+++ b/library/DFVector.h
--- a/library/DFWindow-linux.cpp
+++ b/library/DFWindow-linux.cpp
--- a/library/DFWindow-windows.cpp
+++ b/library/DFWindow-windows.cpp
--- a/library/DFWindow.h
+++ b/library/DFWindow.h
--- a/library/Export.h
+++ b/library/Export.h
--- a/library/Tranquility.h
+++ b/library/Tranquility.h
--- a/library/argstream/argstream.h
+++ b/library/argstream/argstream.h
--- a/library/config.h.cmake
+++ b/library/config.h.cmake
--- a/library/integers.h
+++ b/library/integers.h
--- a/library/md5/md5.cpp
+++ b/library/md5/md5.cpp
--- a/library/md5/md5.h
+++ b/library/md5/md5.h
--- a/library/md5/md5wrapper.cpp
+++ b/library/md5/md5wrapper.cpp
--- a/library/md5/md5wrapper.h
+++ b/library/md5/md5wrapper.h
--- a/library/pydfhack.i
+++ b/library/pydfhack.i
--- a/library/stdint_win.h
+++ b/library/stdint_win.h
--- a/library/tinyxml/tinystr.cpp
+++ b/library/tinyxml/tinystr.cpp
--- a/library/tinyxml/tinystr.h
+++ b/library/tinyxml/tinystr.h
--- a/library/tinyxml/tinyxml.cpp
+++ b/library/tinyxml/tinyxml.cpp
--- a/library/tinyxml/tinyxml.h
+++ b/library/tinyxml/tinyxml.h
--- a/library/tinyxml/tinyxmlerror.cpp
+++ b/library/tinyxml/tinyxmlerror.cpp
--- a/library/tinyxml/tinyxmlparser.cpp
+++ b/library/tinyxml/tinyxmlparser.cpp
--- a/library/unmaintained/DFHackAPIc.cpp
+++ b/library/unmaintained/DFHackAPIc.cpp
--- a/library/unmaintained/DFHackAPIc.h
+++ b/library/unmaintained/DFHackAPIc.h
--- a/library/unmaintained/LinuxMemAccess-ptrace.h
+++ b/library/unmaintained/LinuxMemAccess-ptrace.h
--- a/library/unmaintained/TileTypeLeftovers.cpp
+++ b/library/unmaintained/TileTypeLeftovers.cpp
--- 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>