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

Merge branch 'master' of git://github.com/belal/dfhack

develop
Petr Mrázek 2010-03-15 17:18:27 +01:00
parent 8b0173ae05 a2eb3a6892
commit ff27cdb2f3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/DFProcess.h
Unescape Escape View File

@ -27,6 +27,7 @@ distribution.
#include "Tranquility.h" #include "Tranquility.h"
#include "Export.h" #include "Export.h"
#include <iostream>
namespace DFHack namespace DFHack
{ {
@ -55,7 +56,7 @@ namespace DFHack
} }
inline void print() inline void print()
{ {
cout << hex << start << " - " << end << "|" << (read ? "r" : "-") << (write ? "w" : "-") << (execute ? "x" : "-") << "|" << name << endl; std::cout << std::hex << start << " - " << end << "|" << (read ? "r" : "-") << (write ? "w" : "-") << (execute ? "x" : "-") << "|" << name << std::endl;
} }
}; };

2
output/Memory.xml
Unescape Escape View File

@ -847,7 +847,7 @@
<Offset name="creature_flags2">0xE8</Offset> <Offset name="creature_flags2">0xE8</Offset>
<Offset name="creature_sex">0xF2</Offset> <Offset name="creature_sex">0xF2</Offset>
<Offset name="creature_id">0xF4</Offset> <Offset name="creature_id">0xF4</Offset>
<Offset name="creature_squad_name">0x1A4</Offset> <Offset name="creature_squad_name">0x158</Offset>
<Offset name="creature_mood">0x1F8</Offset> <Offset name="creature_mood">0x1F8</Offset>
<Offset name="creature_squad_leader_id">0x228</Offset> <Offset name="creature_squad_leader_id">0x228</Offset>
<Offset name="creature_money">0x2F8</Offset><!-- this is wrong --> <Offset name="creature_money">0x2F8</Offset><!-- this is wrong -->