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

Cleanmap bugfix.

develop
Petr Mrázek 2011-03-14 09:18:09 +01:00
parent cb86f52993
commit 6ed74065d1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,6 +274,9 @@ namespace DFHack
unsigned int unit_grounded : 1;
/// the tile contains an item
unsigned int item : 1;
/// changed
unsigned int unknown : 26;
/*
/// splatter. everyone loves splatter. this doesn't seem to be used anymore
unsigned int mud : 1;
unsigned int vomit :1;
@ -298,6 +301,7 @@ namespace DFHack
unsigned int blood2 : 1;
unsigned int broken_arrows_variant : 1;
unsigned int snow : 1;
*/
};
struct naked_occupancy_grouped
@ -309,8 +313,8 @@ namespace DFHack
unsigned int unit_grounded : 1;
/// the tile contains an item
unsigned int item : 1;
/// splatter. everyone loves splatter. this doesn't seem to be used anymore
unsigned int splatter : 26;
/// changed
unsigned int unknown : 26;
};
union t_occupancy

6
tools/supported/cleanmap.cpp
Unescape Escape View File

@ -65,13 +65,17 @@ int main (int argc, char** argv)
if(Mapz->isValidBlock(x,y,z))
{
Mapz->ReadVeins(x,y,z,0,0,&splatter);
/*
* FIXME: THIS IS BAD
*/
/*
Mapz->ReadOccupancy(x,y,z,&occ);
for(int i = 0; i < 16; i++)
for(int j = 0; j < 16; j++)
{
occ[i][j].unibits.splatter = 0;
}
Mapz->WriteOccupancy(x,y,z,&occ);
Mapz->WriteOccupancy(x,y,z,&occ);*/
for(uint32_t i = 0; i < splatter.size(); i++)
{
DFHack::t_spattervein & vein = splatter[i];