MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/peterix/dfhack

develop
Erik Youngren 2010-07-26 21:49:28 -07:00
parent 6794e74356 294855faef
commit 4410578f49
4 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
output/Memory.xml
Unescape Escape View File

@ -2300,6 +2300,21 @@ map_data_1b60_offset 0x1B9c
Toad: caste vector = 0x60 Toad: caste vector = 0x60
Toad: extract? vector = 0x18f4 Toad: extract? vector = 0x18f4
Toad: colors = 0x36 Toad: colors = 0x36
Buildings
=========
<Address name="buildings_vector">0x92eb068</Address>
<Offset name="building_custom_workshop_type">0xE0</Offset>
<Address name="custom_workshop_vector">0x93302e8</Address>
<Offset name="custom_workshop_name">0x4</Offset>
<Offset name="custom_workshop_type">0x8</Offset>
<VTable name="building_vtable">
<multiclass name="building_trapst" typeoffset="0xC0" />
<multiclass name="building_workshopst" typeoffset="0xC0" />
<multiclass name="building_furnacest" typeoffset="0xCE" />
<multiclass name="building_siegeenginest" typeoffset="0xC0" />
</VTable>
</Entry> </Entry>
<Entry version="v0.31.11" os="linux" id="30_11lin" base="30_10lin" rebase="0x1D020"> <Entry version="v0.31.11" os="linux" id="30_11lin" base="30_10lin" rebase="0x1D020">
<!-- BIG rebase, possible broken stuff --> <!-- BIG rebase, possible broken stuff -->

13
tools/examples/CMakeLists.txt
Unescape Escape View File

@ -54,4 +54,17 @@ TARGET_LINK_LIBRARIES(dfspatterdump dfhack)
ADD_EXECUTABLE(dfprocessenum processenum.cpp) ADD_EXECUTABLE(dfprocessenum processenum.cpp)
TARGET_LINK_LIBRARIES(dfprocessenum dfhack) TARGET_LINK_LIBRARIES(dfprocessenum dfhack)
install(TARGETS
dfbuildingsdump
dfconstructiondump
dfcreaturedump
dfmaterialtest
dfposition
dfitemdump
dfhotkeynotedump
dftreedump
dfspatterdump
dfprocessenum
RUNTIME DESTINATION bin
)
ENDIF (BUILD_DFHACK_EXAMPLES) ENDIF (BUILD_DFHACK_EXAMPLES)

15
tools/playground/CMakeLists.txt
Unescape Escape View File

@ -64,4 +64,19 @@ TARGET_LINK_LIBRARIES(dfcatsplosion dfhack)
#ADD_EXECUTABLE(dfrenamer renamer.cpp) #ADD_EXECUTABLE(dfrenamer renamer.cpp)
#TARGET_LINK_LIBRARIES(dfrenamer dfhack) #TARGET_LINK_LIBRARIES(dfrenamer dfhack)
install(TARGETS
dfmoodump
dftest
dfdoffsets
dfdigger
dfdigger2
dfcatsplosion
RUNTIME DESTINATION bin
)
IF(UNIX)
install(TARGETS
dfincremental
RUNTIME DESTINATION bin
)
ENDIF(UNIX)
ENDIF (BUILD_DFHACK_PLAYGROUND) ENDIF (BUILD_DFHACK_PLAYGROUND)

5
tools/playground/incrementalsearch.cpp
Unescape Escape View File

@ -397,8 +397,9 @@ void FindVectorByLength(DFHack::ContextManager & DFMgr, vector <DFHack::t_memran
DFHack::Context * DF = DFMgr.getSingleContext(); DFHack::Context * DF = DFMgr.getSingleContext();
DF->Attach(); DF->Attach();
SegmentedFinder sf(ranges,DF); SegmentedFinder sf(ranges,DF);
sf.Incremental<int ,vecTriplet>(0,4,found,vectorAll); //sf.Incremental<int ,vecTriplet>(0,4,found,vectorAll);
sf.Filter<uint32_t,vecTriplet>(length * element_size,found,vectorLength<uint32_t>); //sf.Filter<uint32_t,vecTriplet>(length * element_size,found,vectorLength<uint32_t>);
sf.Incremental<uint32_t,vecTriplet>(length * element_size, 4 , found, vectorLength<uint32_t>);
DF->Detach(); DF->Detach();
} }
} }