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

Dreary offset work.

develop
Petr Mrázek 2011-04-02 12:35:23 +02:00
parent 091cc88655
commit 68b13d6bf0
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Memory.xml
Unescape Escape View File

@ -2155,6 +2155,7 @@
<Version name="v0.31.25 SDL" os="windows" base="v0.31.24 SDL"> <Version name="v0.31.25 SDL" os="windows" base="v0.31.24 SDL">
<PETimeStamp value="0x4D90764F" /> <PETimeStamp value="0x4D90764F" />
<MD5 value="6ada05fc94785b53efe6aa5728b3756b" /> <MD5 value="6ada05fc94785b53efe6aa5728b3756b" />
Engravings: 0x16B0A78
</Version> </Version>
.-"""-. .-"""-.
' \ ' \
@ -2684,6 +2685,17 @@
<Version name="v0.31.22 linux" os="linux" base="v0.31.19 linux" rebase="0x12A80"> <Version name="v0.31.22 linux" os="linux" base="v0.31.19 linux" rebase="0x12A80">
<MD5 value="c7319be110759209bd736071fb367960" /> <MD5 value="c7319be110759209bd736071fb367960" />
<Offsets> <Offsets>
<Group name="Buildings" valid="true">
<Address name="buildings_vector" value="0x940b998" />
One of the two, really:
0x940b998
0x940b9a4
<Address name="custom_workshop_vector" value="0x94506f8" />
</Group>
<Group name="Constructions" valid="true">
<Address name="vector" value="0x93f7984" />
<Offset name="sizeof"/>
</Group>
<Group name="Position"> <Group name="Position">
<Address name="cursor_xyz" value="0x8c3dfc0" /> <Address name="cursor_xyz" value="0x8c3dfc0" />
<Address name="window_dims" value="0x8c3e4c8" /> <Address name="window_dims" value="0x8c3e4c8" />
@ -2769,9 +2781,33 @@
<Address name="language_vector" value="0x944c564"/> <Address name="language_vector" value="0x944c564"/>
<Address name="translation_vector" value="0x944c57c"/> <Address name="translation_vector" value="0x944c57c"/>
</Group> </Group>
<Group name="Vegetation" valid="true">
<Address name="vector" value="0x940bed0" />
</Group>
<Group name="World">
<Address name="control_mode" value="0x8c3dff0" />
<Address name="game_mode" value="0x8c3e000" />
<Address name="current_weather" value="0x936e248" valid="false" />
<Address name="current_year" value="0x936e264" valid="false" />
<Address name="current_tick" value="0x936e284" valid="false" />
</Group>
</Offsets> </Offsets>
</Version> </Version>
<Version name="v0.31.23 linux" os="linux" base="v0.31.22 linux">
<MD5 value="c8e82e6e7cc606bf4e8d2c91993b9c0d" />
<Offsets valid="false" />
</Version>
<Version name="v0.31.24 linux" os="linux" base="v0.31.23 linux">
<MD5 value="a47468cec4f4f0ff1fc03ac7d95c17ed" />
<Offsets valid="false" />
</Version>
<Version name="v0.31.25 linux" os="linux" base="v0.31.24 linux">
<MD5 value="fc15065c4d1977ca019c6dad220413d1" />
<Offsets valid="false" />
Engravings: 0x93f7918
there are some possibly related vectors right next to it.
</Version>
</DFHack> </DFHack>

2
library/DFProcess-linux-base.cpp
Unescape Escape View File

@ -89,7 +89,7 @@ void LinuxProcessBase::getMemRanges( vector<t_memrange> & ranges )
{ {
t_memrange temp; t_memrange temp;
temp.name[0] = 0; temp.name[0] = 0;
sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %s", sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %[^\n]s",
&start, &start,
&end, &end,
(char*)&permissions, (char*)&permissions,

1
library/DFProcess_C.cpp
Unescape Escape View File

@ -25,6 +25,7 @@ distribution.
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <cstring>
using namespace std; using namespace std;

1
tools/supported/SegmentedFinder.h
Unescape Escape View File

@ -12,6 +12,7 @@ class SegmentFinder
{ {
_DF = DF; _DF = DF;
mr_ = mr; mr_ = mr;
valid=false;
if(mr.valid) if(mr.valid)
{ {
mr_.buffer = (uint8_t *)malloc (mr_.end - mr_.start); mr_.buffer = (uint8_t *)malloc (mr_.end - mr_.start);