settlement offsets for windows and linux d9-d17, fixes for linux offsets, forgot the name offset, and switched the current and all settlement address :)

develop
belal 2010-02-24 13:34:40 -05:00 committed by Petr Mrázek
parent a5d42e4051
commit 0fa2bb8cd8
2 changed files with 25 additions and 6 deletions

@ -46,7 +46,7 @@ int main (int argc,const char* argv[])
} }
// MSVC claims this is causing the heap to be corrupted, I think it is because the currentSettlement vector only has 1 item in it // MSVC claims this is causing the heap to be corrupted, I think it is because the currentSettlement vector only has 1 item in it
cout << "Current Settlement\n"; cout << "Current Settlement\n";
DF.ReadCurrentSettlement(0,current); DF.ReadCurrentSettlement(current);
printSettlement(DF,current,names); printSettlement(DF,current,names);
DF.FinishReadNameTables(); DF.FinishReadNameTables();

@ -819,6 +819,13 @@
<Offset name="hotkey_xyz">0x20</Offset> <Offset name="hotkey_xyz">0x20</Offset>
<HexValue name="hotkey_size">0x2C</HexValue> <HexValue name="hotkey_size">0x2C</HexValue>
<Address name="settlement_current">0x01533CC0</Address>
<Address name="settlements">0x01533BF4</Address>
<Offset name="settlement_name">0x38</Offset>
<Offset name="settlement_world_xy">0x7a</Offset>
<Offset name="settlement_local_xy">0x100</Offset>
</Entry> </Entry>
<Entry version="v0.28.181.40d11" os="windows" rebase="0x2d388" id="40d11win" base="40d9win"> <Entry version="v0.28.181.40d11" os="windows" rebase="0x2d388" id="40d11win" base="40d9win">
<!-- identification --> <!-- identification -->
@ -876,6 +883,8 @@
<Address name="window_z">0xdc7628</Address> <Address name="window_z">0xdc7628</Address>
<Address name="window_dims">0x173fde0</Address> <Address name="window_dims">0x173fde0</Address>
<Address name="settlement_current">0x015FCACC</Address>
<Address name="settlements">0x015FCA00</Address>
</Entry> </Entry>
<Entry version="v0.28.181.40d13" os="windows" id="40d13win" base="40d12win" rebase="0x5090"> <Entry version="v0.28.181.40d13" os="windows" id="40d13win" base="40d12win" rebase="0x5090">
@ -1145,10 +1154,6 @@
<Address name="settlement_current">0x16385DC</Address> <Address name="settlement_current">0x16385DC</Address>
<Address name="settlements">0x1638510</Address> <Address name="settlements">0x1638510</Address>
<Offset name="settlement_name">0x38</Offset>
<Offset name="settlement_world_xy">0x7a</Offset>
<Offset name="settlement_local_xy">0x100</Offset>
<VTable name="viewscreen_vtable"> <VTable name="viewscreen_vtable">
<class vtable="0x0092014C" name="viewscreen_conversation" /> <class vtable="0x0092014C" name="viewscreen_conversation" />
<class vtable="0x0092752C" name="viewscreen_option" /> <class vtable="0x0092752C" name="viewscreen_option" />
@ -1764,6 +1769,13 @@
<Offset name="hotkey_xyz">0x8</Offset> <Offset name="hotkey_xyz">0x8</Offset>
<HexValue name="hotkey_size">0x14</HexValue> <HexValue name="hotkey_size">0x14</HexValue>
<Address name="settlement_current">0x09374BCC</Address>
<Address name="settlements">0x09374B60</Address>
<Offset name="settlement_name">0x08</Offset>
<Offset name="settlement_world_xy">0x4a</Offset>
<Offset name="settlement_local_xy">0x94</Offset>
<!-- virtual tables extracted from DF --> <!-- virtual tables extracted from DF -->
<VTable name="building_vtable"> <VTable name="building_vtable">
<class vtable="0x08797448" name="building_construction" /> <class vtable="0x08797448" name="building_construction" />
@ -1914,6 +1926,10 @@
<Address name="notes">0x08F41644</Address> <Address name="notes">0x08F41644</Address>
<Address name="hotkey_start">0x08F4166C</Address> <Address name="hotkey_start">0x08F4166C</Address>
<Address name="settlement_current">0x08F977C8</Address>
<Address name="settlements">0x08F9775C</Address>
<VTable name = "vein_vtable"> <VTable name = "vein_vtable">
<class vtable="0x086be6c8" name="block_square_event_frozen_liquid" /> <class vtable="0x086be6c8" name="block_square_event_frozen_liquid" />
<class vtable="0x086be608" name="block_square_event_mineral" /> <class vtable="0x086be608" name="block_square_event_mineral" />
@ -2179,6 +2195,9 @@
<Address name="notes">0x08F4E7C4</Address> <Address name="notes">0x08F4E7C4</Address>
<Address name="hotkey_start">0x08F4E7EC</Address> <Address name="hotkey_start">0x08F4E7EC</Address>
<Address name="settlement_current">0x08FA4948</Address>
<Address name="settlements">0x08FA48DC</Address>
<!--<VTable name="building_vtable" rebase="0xAE20" />--> <!-- Door: 0x86D26E8 --> <!--<VTable name="building_vtable" rebase="0xAE20" />--> <!-- Door: 0x86D26E8 -->
<VTable name="viewscreen_vtable"> <VTable name="viewscreen_vtable">
<class vtable="0x086D5488" name="viewscreen_conversation" /> <class vtable="0x086D5488" name="viewscreen_conversation" />