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

New vegetation variables, fixed vegetation vector for 31.25 linux

develop
Petr Mrázek 2011-05-14 15:51:11 +02:00
parent cae7306f93
commit b65c4ed55b
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Memory.xml
Unescape Escape View File

@ -3075,6 +3075,9 @@
</Group> </Group>
</Group> </Group>
</Group> </Group>
<Group name="Vegetation">
<Address name="vector" value="0x940bd70" />
</Group>
</Offsets> </Offsets>
</Version> </Version>
</DFHack> </DFHack>

19
library/include/dfhack/modules/Vegetation.h
Unescape Escape View File

@ -10,13 +10,12 @@
#include "dfhack/DFModule.h" #include "dfhack/DFModule.h"
namespace DFHack namespace DFHack
{ {
/** /**
* \ingroup grp_vegetation * \ingroup grp_vegetation
*/ */
struct t_tree struct t_tree
{ {
// +0x6C // +0x3C
#pragma pack(push, 1) #pragma pack(push, 1)
union union
{ {
@ -29,10 +28,18 @@ namespace DFHack
}; };
}; };
#pragma pack(pop) #pragma pack(pop)
uint16_t material; // +0x6E uint16_t material; // +0x3E
uint16_t x; // +0x70 uint16_t x; // +0x40
uint16_t y; // +0x72 uint16_t y; // +0x42
uint16_t z; // +0x74 uint16_t z; // +0x44
uint16_t padding; // +0x46
uint32_t unknown_1; // +0x48
uint16_t temperature_1; // +0x4C
uint16_t temperature_2; // +0x4E - maybe fraction?
uint32_t mystery_flag; // 0x50: yes, just one
uint32_t unknown_2; // 0x54
uint32_t unknown_3; // 0x58
// a vector is here
uint32_t address; uint32_t address;
}; };

24
tools/examples/treedump.cpp
Unescape Escape View File

@ -11,7 +11,21 @@ using namespace std;
#define DFHACK_WANT_MISCUTILS #define DFHACK_WANT_MISCUTILS
#include <DFHack.h> #include <DFHack.h>
/*
uint16_t material; // +0x3E
uint16_t x; // +0x40
uint16_t y; // +0x42
uint16_t z; // +0x44
uint16_t padding; // +0x46
uint32_t unknown_1; // +0x48
uint16_t temperature_1; // +0x4C
uint16_t temperature_2; // +0x4E - maybe fraction?
uint32_t mystery_flag; // 0x50: yes, just one
uint32_t unknown_2; // 0x54
uint32_t unknown_3; // 0x58
// a vector is here
uint32_t address;
*/
void print_tree( DFHack::Context * DF , DFHack::t_tree & tree) void print_tree( DFHack::Context * DF , DFHack::t_tree & tree)
{ {
DFHack::Materials * mat = DF->getMaterials(); DFHack::Materials * mat = DF->getMaterials();
@ -31,6 +45,12 @@ void print_tree( DFHack::Context * DF , DFHack::t_tree & tree)
cout << "shrub"; cout << "shrub";
} }
cout << endl; cout << endl;
printf("unknown_1: 0x%08x\n", tree.unknown_1);
printf("temperature_1: %d\n", tree.temperature_1);
printf("temperature_2: %d\n", tree.temperature_2);
printf("mystery_flag: %d\n", tree.mystery_flag);
printf("unknown_2: 0x%08x\n", tree.unknown_2);
printf("unknown_3: 0x%08x\n", tree.unknown_3);
printf("Address: 0x%x\n", tree.address); printf("Address: 0x%x\n", tree.address);
hexdump(DF,tree.address,13*16); hexdump(DF,tree.address,13*16);
} }
@ -110,7 +130,7 @@ int main (int numargs, const char ** args)
v->Read(i,tree); v->Read(i,tree);
if(tree.x == x && tree.y == y && tree.z == z) if(tree.x == x && tree.y == y && tree.z == z)
{ {
cout << "----==== Tree at "<< x << "/" << y << "/" << z << " ====----" << endl; cout << "----==== Tree at "<< dec << x << "/" << y << "/" << z << " ====----" << endl;
print_tree(DF, tree); print_tree(DF, tree);
break; break;
} }