Skip to content

Commit 6ed7406

Browse files
committed
Cleanmap bugfix.
1 parent cb86f52 commit 6ed7406

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

library/include/dfhack/modules/Maps.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,9 @@ namespace DFHack
274274
unsigned int unit_grounded : 1;
275275
/// the tile contains an item
276276
unsigned int item : 1;
277+
/// changed
278+
unsigned int unknown : 26;
279+
/*
277280
/// splatter. everyone loves splatter. this doesn't seem to be used anymore
278281
unsigned int mud : 1;
279282
unsigned int vomit :1;
@@ -298,6 +301,7 @@ namespace DFHack
298301
unsigned int blood2 : 1;
299302
unsigned int broken_arrows_variant : 1;
300303
unsigned int snow : 1;
304+
*/
301305
};
302306

303307
struct naked_occupancy_grouped
@@ -309,8 +313,8 @@ namespace DFHack
309313
unsigned int unit_grounded : 1;
310314
/// the tile contains an item
311315
unsigned int item : 1;
312-
/// splatter. everyone loves splatter. this doesn't seem to be used anymore
313-
unsigned int splatter : 26;
316+
/// changed
317+
unsigned int unknown : 26;
314318
};
315319

316320
union t_occupancy

tools/supported/cleanmap.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,17 @@ int main (int argc, char** argv)
6565
if(Mapz->isValidBlock(x,y,z))
6666
{
6767
Mapz->ReadVeins(x,y,z,0,0,&splatter);
68+
/*
69+
* FIXME: THIS IS BAD
70+
*/
71+
/*
6872
Mapz->ReadOccupancy(x,y,z,&occ);
6973
for(int i = 0; i < 16; i++)
7074
for(int j = 0; j < 16; j++)
7175
{
7276
occ[i][j].unibits.splatter = 0;
7377
}
74-
Mapz->WriteOccupancy(x,y,z,&occ);
78+
Mapz->WriteOccupancy(x,y,z,&occ);*/
7579
for(uint32_t i = 0; i < splatter.size(); i++)
7680
{
7781
DFHack::t_spattervein & vein = splatter[i];

0 commit comments

Comments
 (0)