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

fixes

develop
Petr Mrázek 2009-11-08 12:51:54 +00:00
parent 215bb64a1e
commit 8185f72b63
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/DFHackAPI.cpp
Unescape Escape View File

@ -644,14 +644,14 @@ uint32_t DFHackAPIImpl::InitReadCreatures()
creaturesInited = true; creaturesInited = true;
int creatures = offset_descriptor->getAddress("creatures"); int creatures = offset_descriptor->getAddress("creatures");
creature_pos_offset = offset_descriptor->getOffset("creature_position"); creature_pos_offset = offset_descriptor->getOffset("creature_position");
creature_type_offset = offset_descriptor->getOffset("creature_type"); creature_type_offset = offset_descriptor->getOffset("creature_race");
creature_flags1_offset = offset_descriptor->getOffset("creature_flags1"); creature_flags1_offset = offset_descriptor->getOffset("creature_flags1");
creature_flags2_offset = offset_descriptor->getOffset("creature_flags2"); creature_flags2_offset = offset_descriptor->getOffset("creature_flags2");
creature_first_name_offset = offset_descriptor->getOffset("creature_first_name"); creature_first_name_offset = offset_descriptor->getOffset("creature_first_name");
creature_nick_name_offset = offset_descriptor->getOffset("creature_nick_name"); creature_nick_name_offset = offset_descriptor->getOffset("creature_nick_name");
creature_last_name_offset = offset_descriptor->getOffset("creature_last_name"); creature_last_name_offset = offset_descriptor->getOffset("creature_last_name");
creature_custom_profession_offset = offset_descriptor->getOffset("creature_custom_profession"); creature_custom_profession_offset = offset_descriptor->getOffset("creature_custom_profession");
creature_profession_offset = offset_descriptor->getOffset("creature_creature_profession"); creature_profession_offset = offset_descriptor->getOffset("creature_profession");
creature_sex_offset = offset_descriptor->getOffset("creature_sex"); creature_sex_offset = offset_descriptor->getOffset("creature_sex");
creature_id_offset = offset_descriptor->getOffset("creature_id"); creature_id_offset = offset_descriptor->getOffset("creature_id");
creature_squad_name_offset = offset_descriptor->getOffset("creature_squad_name"); creature_squad_name_offset = offset_descriptor->getOffset("creature_squad_name");
@ -795,7 +795,7 @@ void DFHackAPIImpl::InitReadNameTables()
} }
} }
dwarf_lang_table_offset = dwarf_entry + word_table_offset-4; dwarf_lang_table_offset = dwarf_entry + word_table_offset;
p_dwarf_names = new DfVector(dm->readVector(dwarf_lang_table_offset,4)); p_dwarf_names = new DfVector(dm->readVector(dwarf_lang_table_offset,4));
nameTablesInited = true; nameTablesInited = true;
} }

4
library/DFProcessManager.cpp
Unescape Escape View File

@ -391,6 +391,10 @@ void ProcessManager::ParseEntry (TiXmlElement* entry, memory_info& mem, map <str
// users are free to use a sane kernel that doesn't do this kind of **** by default // users are free to use a sane kernel that doesn't do this kind of **** by default
mem.setBase(0x0); mem.setBase(0x0);
} }
else if ( os == "all")
{
// yay
}
else else
{ {
cerr << "unknown operating system " << os << endl; cerr << "unknown operating system " << os << endl;

20
output/Memory.xml
Unescape Escape View File

@ -392,7 +392,7 @@
<!-- translation tables --> <!-- translation tables -->
<Address name="translation_vector">0x015c6ef0</Address> <Address name="translation_vector">0x015c6ef0</Address>
<Address name="language_vector">0x015c6ed0</Address> <Address name="language_vector">0x015c6ed0</Address>
<Offset name="word_table">0x40</Offset> <Offset name="word_table">0x3C</Offset>
<!-- job object offsets --> <!-- job object offsets -->
<Offset name="current_job_id">0x08</Offset> <Offset name="current_job_id">0x08</Offset>
@ -570,7 +570,7 @@
<!-- translation tables --> <!-- translation tables -->
<Address name="translation_vector">0x01534270</Address> <Address name="translation_vector">0x01534270</Address>
<Address name="language_vector">0x01534240</Address> <Address name="language_vector">0x01534240</Address>
<Offset name="word_table">0x58</Offset> <Offset name="word_table">0x54</Offset>
<!-- creature offsets --> <!-- creature offsets -->
<Offset name="creature_flags1">0xFC</Offset> <Offset name="creature_flags1">0xFC</Offset>
@ -748,12 +748,20 @@
<Address name="vegetation">0x09335CB0</Address> <Address name="vegetation">0x09335CB0</Address>
<Address name="creatures">0x093326AC</Address> <Address name="creatures">0x093326AC</Address>
<!-- translation tables -->
<Address name="translation_vector">0xDEADBEEF</Address> <!-- WRONG! -->
<Address name="language_vector">0xDEADBEEF</Address> <!-- WRONG! -->
<Offset name="word_table">0x1C</Offset> <!-- possibly wrong -->
<!-- job object offsets -->
<Offset name="current_job_id">0x08</Offset> <!-- possibly wrong -->
<!-- creature offsets --> <!-- creature offsets -->
<Offset name="creature_first_name">0x00</Offset> <Offset name="creature_first_name">0x00</Offset>
<Offset name="creature_nick_name">0x04</Offset> <Offset name="creature_nick_name">0x04</Offset>
<Offset name="creature_last_name">0x08</Offset> <Offset name="creature_last_name">0x08</Offset>
<Offset name="creature_position">0x4C</Offset> <Offset name="creature_position">0x4C</Offset>
<Offset name="creature_type">0x44</Offset> <Offset name="creature_race">0x44</Offset>
<Offset name="creature_flags1">0x90</Offset> <Offset name="creature_flags1">0x90</Offset>
<Offset name="creature_flags2">0x94</Offset> <Offset name="creature_flags2">0x94</Offset>
<Offset name="creature_custom_profession">0x003c</Offset> <Offset name="creature_custom_profession">0x003c</Offset>
@ -761,6 +769,7 @@
<Offset name="creature_sex">0x009E</Offset> <Offset name="creature_sex">0x009E</Offset>
<Offset name="creature_id">0x00A0</Offset> <Offset name="creature_id">0x00A0</Offset>
<Offset name="creature_squad_name">0x0100</Offset> <Offset name="creature_squad_name">0x0100</Offset>
<Offset name="creature_squad_leader_id">0x0100</Offset> <!-- completely bogus, needs cross-referencing with windows version -->
<Offset name="creature_money">0x02F8</Offset> <Offset name="creature_money">0x02F8</Offset>
<Offset name="creature_current_job">0x0200</Offset> <Offset name="creature_current_job">0x0200</Offset>
<Offset name="creature_strength">0x0334</Offset> <Offset name="creature_strength">0x0334</Offset>
@ -917,6 +926,11 @@
<Address name="vegetation">0x08F58890</Address> <Address name="vegetation">0x08F58890</Address>
<Address name="creatures">0x08F55250</Address> <Address name="creatures">0x08F55250</Address>
<!-- translation tables -->
<!-- these should be right -->
<Address name="translation_vector">0x08F97BA4</Address>
<Address name="language_vector">0x08F97B8C</Address>
<!-- size of the map --> <!-- size of the map -->
<Address name="x_count">0x08F95BD0</Address> <Address name="x_count">0x08F95BD0</Address>
<Address name="y_count">0x08F95BD4</Address> <Address name="y_count">0x08F95BD4</Address>