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

weather offset for 31.19

develop
Petr Mrázek 2011-02-21 09:59:05 +01:00
parent d0c76c8162
commit 6946d53e56
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/Memory-ng.xml
Unescape Escape View File

@ -1966,6 +1966,11 @@
<Offset name="custom_workshop_type" value="0x20" /> INVALID? <Offset name="custom_workshop_type" value="0x20" /> INVALID?
--> -->
</Group> </Group>
<Group name="World" valid="false">
<Address name="current_tick" description="Current time of the year" />
<Address name="current_year" description="Current year" />
<Address name="current_weather" value="0x15027A0" valid="true" />
</Group>
<!-- <!--
<Address name="WORLD" valid="false" /> <Address name="WORLD" valid="false" />
<Group name="Maps"> <Group name="Maps">
@ -2003,11 +2008,6 @@
<Offset name="item_improvement_quality" /> <Offset name="item_improvement_quality" />
<Offset name="item_type_accessor" /> (in the vtable) <Offset name="item_type_accessor" /> (in the vtable)
</Group> </Group>
<Group name="World" valid="false">
<Address name="current_tick" description="Current time of the year" />
<Address name="current_year" description="Current year" />
<Address name="current_weather" value="0x14c9bb8" valid="true" />
</Group>
--> -->
</Offsets> </Offsets>
</Version> </Version>

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

@ -454,7 +454,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
{ {
small = reads - '0'; small = reads - '0';
state = 0; state = 0;
bs.insert(big*16 + small); bs.insert<char>(big*16 + small);
} }
} }
if((reads >= 'a' && reads <= 'f')) if((reads >= 'a' && reads <= 'f'))
@ -468,7 +468,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
{ {
small = reads - 'a' + 10; small = reads - 'a' + 10;
state = 0; state = 0;
bs.insert(big*16 + small); bs.insert<char>(big*16 + small);
} }
} }
it++; it++;
@ -478,7 +478,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
if (state == 1) if (state == 1)
{ {
small = 0; small = 0;
bs.insert(big*16 + small); bs.insert<char>(big*16 + small);
} }
} }
else else