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

Urrgh. Seriously.

develop
Petr Mrázek 2010-10-07 01:23:35 +02:00
parent daf7c0a2ee
commit b3121b898d
4 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/Memory-ng.xml
Unescape Escape View File

@ -1746,6 +1746,26 @@
<Version name="v0.31.15 SDL" os="windows" base="v0.31.14 SDL">
<PETimeStamp value="0x4CA869EA" />
<MD5 value="b4d188dfb592fc813dad31f45407991d" />
</Version>
<Version name="v0.31.16 SDL" os="windows" base="v0.31.15 SDL" rebase="0x1050">
<PETimeStamp value="0x4CA9D544" />
<MD5 value="702b3ebaae468f73eb1411af54863013" />
<Offsets>
<Group name="Position">
<Address name="cursor_xyz" value="0xac97f0 0xac9840" />
<!--<Address name="screen_tiles_pointer" value="0x14826d4" />--> AS BOGUS AS IT GETS
<Address name="window_dims" value="0xaca07c 0xaca0cc" />
<Address name="window_x" value="0xE44C74 0xe44cc4" />
<Address name="window_y" value="0xE72D48 0xe72d98" />
<Address name="window_z" value="0xe72d24 0xe72d74" />
</Group>
<Group name="GUI">
<Address name="pause_state" value="0x1480971" />
</Group>
<Group name="World">
<Address name="current_weather" value="0x1480948" />
</Group>
</Offsets>
</Version>
.-"""-.
' \

18
library/include/dfhack/modules/Maps.h
Unescape Escape View File

@ -149,6 +149,14 @@ namespace DFHack
liquid_magma
};
enum e_liquidcharacter
{
liquid_fresh,
liquid_unk1,
liquid_salt,
liquid_unk2,
};
struct naked_designation
{
unsigned int flow_size : 3; // how much liquid is here?
@ -188,8 +196,14 @@ namespace DFHack
unsigned int feature_local : 1;
/// this tile is a part of a global feature. can be combined with 'featstone' tiles
unsigned int feature_global : 1;
/// those ripples on streams?
unsigned int liquid_character : 2;
/**
* water characteristics
* fresh=0
* ?=1
* salt=2
* ?=3
*/
e_liquidcharacter liquid_character : 2;
};
union t_designation

2
library/modules/Materials.cpp
Unescape Escape View File

@ -402,7 +402,7 @@ bool Materials::ReadCreatureTypesEx (void)
p->readSTLString (caste_start + sizeof_string, caste.singular, sizeof(caste.singular));
p->readSTLString (caste_start + 2 * sizeof_string, caste.plural, sizeof(caste.plural));
p->readSTLString (caste_start + 3 * sizeof_string, caste.adjective, sizeof(caste.adjective));
cout << "Caste " << caste.rawname << " " << caste.singular << ": 0x" << hex << caste_start << endl;
//cout << "Caste " << caste.rawname << " " << caste.singular << ": 0x" << hex << caste_start << endl;
if(have_advanced)
{
/* color mod reading */

10
tools/examples/creaturedump.cpp
Unescape Escape View File

@ -302,7 +302,15 @@ void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature)
{
cout << ", ";
}
cout << mem->getSkill(creature.defaultSoul.skills[i].id) << ": " << creature.defaultSoul.skills[i].rating;
try
{
cout << mem->getSkill(creature.defaultSoul.skills[i].id) << ": " << creature.defaultSoul.skills[i].rating;
}
catch(DFHack::Error::MissingMemoryDefinition &e)
{
cout << "Unknown skill! : " << creature.defaultSoul.skills[i].id <<", rating: " << creature.defaultSoul.skills[i].rating << endl;
cout << e.what() << endl;
}
}
cout << endl;
cout << "Traits" << endl;