Skip to content

Commit 6946d53

Browse files
committed
weather offset for 31.19
1 parent d0c76c8 commit 6946d53

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

data/Memory-ng.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,6 +1966,11 @@
19661966
<Offset name="custom_workshop_type" value="0x20" /> INVALID?
19671967
-->
19681968
</Group>
1969+
<Group name="World" valid="false">
1970+
<Address name="current_tick" description="Current time of the year" />
1971+
<Address name="current_year" description="Current year" />
1972+
<Address name="current_weather" value="0x15027A0" valid="true" />
1973+
</Group>
19691974
<!--
19701975
<Address name="WORLD" valid="false" />
19711976
<Group name="Maps">
@@ -2003,11 +2008,6 @@
20032008
<Offset name="item_improvement_quality" />
20042009
<Offset name="item_type_accessor" /> (in the vtable)
20052010
</Group>
2006-
<Group name="World" valid="false">
2007-
<Address name="current_tick" description="Current time of the year" />
2008-
<Address name="current_year" description="Current year" />
2009-
<Address name="current_weather" value="0x14c9bb8" valid="true" />
2010-
</Group>
20112011
-->
20122012
</Offsets>
20132013
</Version>

tools/supported/SegmentedFinder.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
454454
{
455455
small = reads - '0';
456456
state = 0;
457-
bs.insert(big*16 + small);
457+
bs.insert<char>(big*16 + small);
458458
}
459459
}
460460
if((reads >= 'a' && reads <= 'f'))
@@ -468,7 +468,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
468468
{
469469
small = reads - 'a' + 10;
470470
state = 0;
471-
bs.insert(big*16 + small);
471+
bs.insert<char>(big*16 + small);
472472
}
473473
}
474474
it++;
@@ -478,7 +478,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
478478
if (state == 1)
479479
{
480480
small = 0;
481-
bs.insert(big*16 + small);
481+
bs.insert<char>(big*16 + small);
482482
}
483483
}
484484
else

0 commit comments

Comments
 (0)