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

force creation of extents for abstract buildings

develop
myk002 2021-06-07 07:02:46 -07:00
parent 7d7d1feb4b
commit 1a016a0ff3
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
library/modules/Buildings.cpp
Unescape Escape View File

@ -587,6 +587,18 @@ bool Buildings::getCorrectSize(df::coord2d &size, df::coord2d &center,
} }
} }
static void init_extents(df::building_extents *ext, const df::coord &pos,
const df::coord2d &size)
{
ext->extents = new df::building_extents_type[size.x*size.y];
ext->x = pos.x;
ext->y = pos.y;
ext->width = size.x;
ext->height = size.y;
memset(ext->extents, 1, size.x*size.y);
}
bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size, bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
df::building_extents *ext, df::building_extents *ext,
bool create_ext, bool create_ext,
@ -640,13 +652,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
if (!ext->extents) if (!ext->extents)
{ {
ext->extents = new df::building_extents_type[size.x*size.y]; init_extents(ext, pos, size);
ext->x = pos.x;
ext->y = pos.y;
ext->width = size.x;
ext->height = size.y;
memset(ext->extents, 1, size.x*size.y);
etile = getExtentTile(*ext, tile); etile = getExtentTile(*ext, tile);
} }
@ -670,10 +676,17 @@ std::pair<df::coord,df::coord2d> Buildings::getSize(df::building *bld)
return std::pair<df::coord,df::coord2d>(pos, df::coord2d(bld->x2+1,bld->y2+1) - pos); return std::pair<df::coord,df::coord2d>(pos, df::coord2d(bld->x2+1,bld->y2+1) - pos);
} }
static bool checkBuildingTiles(df::building *bld, bool can_change) static bool checkBuildingTiles(df::building *bld, bool can_change,
bool force_extents = false)
{ {
auto psize = Buildings::getSize(bld); auto psize = Buildings::getSize(bld);
if (force_extents && !bld->room.extents)
{
// populate the room structure if it's not set already
init_extents(&bld->room, psize.first, psize.second);
}
return Buildings::checkFreeTiles(psize.first, psize.second, &bld->room, return Buildings::checkFreeTiles(psize.first, psize.second, &bld->room,
can_change && bld->isExtentShaped(), can_change && bld->isExtentShaped(),
!bld->isSettingOccupancy(), !bld->isSettingOccupancy(),
@ -978,7 +991,7 @@ bool Buildings::constructAbstract(df::building *bld)
CHECK_INVALID_ARGUMENT(bld->id == -1); CHECK_INVALID_ARGUMENT(bld->id == -1);
CHECK_INVALID_ARGUMENT(!bld->isActual()); CHECK_INVALID_ARGUMENT(!bld->isActual());
if (!checkBuildingTiles(bld, false)) if (!checkBuildingTiles(bld, true, true))
return false; return false;
switch (bld->getType()) switch (bld->getType())