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

massive Memory.xml VTable sections restructure, support for d17 added in Memory.xml, needs testing. shm not updated yet

develop
Petr Mrázek 2010-02-10 00:20:15 +00:00
parent 70bf6954a6
commit b1ce815370
3 changed files with 762 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/DFMemInfoManager.cpp
Unescape Escape View File

@ -80,6 +80,7 @@ void MemInfoManager::ParseEntry (TiXmlElement* entry, memory_info& mem, map <str
const char *cstr_os = entry->Attribute("os");
const char *cstr_base = entry->Attribute("base");
const char *cstr_rebase = entry->Attribute("rebase");
// printf("%s : %s\n",cstr_version, cstr_os);
if(cstr_base)
{
string base = cstr_base;

993
output/Memory.xml
View File

File diff suppressed because it is too large Load Diff

16
tools/buildingsdump.cpp
Unescape Escape View File

@ -143,11 +143,19 @@ int main (int argc,const char* argv[])
{
DFHack::t_building temp;
DF.ReadBuilding(i, temp);
if(buildingtypes[temp.type] == argv[1])
if(temp.type != 0xFFFFFFFF) // check if type isn't invalid
{
//cout << buildingtypes[temp.type] << " 0x" << hex << temp.origin << endl;
//hexdump(DF, temp.origin, 16);
addresses.push_back(temp.origin);
if(buildingtypes[temp.type] == argv[1])
{
//cout << buildingtypes[temp.type] << " 0x" << hex << temp.origin << endl;
//hexdump(DF, temp.origin, 16);
addresses.push_back(temp.origin);
}
}
else
{
// couldn't translate type, print out the vtable
cout << "unknown vtable: " << temp.vtable << endl;
}
}
interleave_hex(DF,addresses,lines / 4);