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

DF code analysis uncovered another item-related flag to clear. 

It turns out, buildings cache their 'site is blocked' state,
and won't actually recheck until the flag is cleared.
develop
Alexander Gavrilov 2012-05-20 21:58:43 +04:00
parent b992b04f0b
commit 32d6257c70
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/modules/Maps.cpp
Unescape Escape View File

@ -41,6 +41,8 @@ using namespace std;
#include "Core.h" #include "Core.h"
#include "MiscUtils.h" #include "MiscUtils.h"
#include "modules/Buildings.h"
#include "DataDefs.h" #include "DataDefs.h"
#include "df/world_data.h" #include "df/world_data.h"
#include "df/world_underground_region.h" #include "df/world_underground_region.h"
@ -1055,7 +1057,21 @@ bool MapExtras::Block::removeItemOnGround(df::item *item)
if (--count == 0) if (--count == 0)
{ {
index_tile<df::tile_occupancy&>(occupancy,item->pos).bits.item = false; index_tile<df::tile_occupancy&>(occupancy,item->pos).bits.item = false;
index_tile<df::tile_occupancy&>(block->occupancy,item->pos).bits.item = false;
auto &occ = index_tile<df::tile_occupancy&>(block->occupancy,item->pos);
occ.bits.item = false;
// Clear the 'site blocked' flag in the building, if any.
// Otherwise the job would be re-suspended without actually checking items.
if (occ.bits.building == tile_building_occ::Planned)
{
if (auto bld = Buildings::findAtTile(item->pos))
{
// TODO: maybe recheck other tiles like the game does.
bld->flags.bits.site_blocked = false;
}
}
} }
return true; return true;