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

remove "room" checking for buildings -- there is no room

develop
Myk Taylor 2023-01-27 13:38:21 -08:00
parent c6f4a7ee42
commit 22dd49ce38
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/LuaApi.cpp
Unescape Escape View File

@ -2234,8 +2234,8 @@ static const luaL_Reg dfhack_burrows_funcs[] = {
/***** Buildings module *****/ /***** Buildings module *****/
static bool buildings_containsTile(df::building *bld, int x, int y, bool room) { static bool buildings_containsTile(df::building *bld, int x, int y) {
return Buildings::containsTile(bld, df::coord2d(x,y), room); return Buildings::containsTile(bld, df::coord2d(x,y));
} }
static const LuaWrapper::FunctionReg dfhack_buildings_module[] = { static const LuaWrapper::FunctionReg dfhack_buildings_module[] = {

6
library/include/modules/Buildings.h
Unescape Escape View File

@ -151,9 +151,11 @@ DFHACK_EXPORT bool checkFreeTiles(df::coord pos, df::coord2d size,
DFHACK_EXPORT int countExtentTiles(df::building_extents *ext, int defval = -1); DFHACK_EXPORT int countExtentTiles(df::building_extents *ext, int defval = -1);
/** /**
* Checks if the building contains the specified tile. * Checks if the building contains the specified tile. If the building has
* extents, returns whether tile is included within the extents. The x and y in
* tile are the map coordinates without the z component.
*/ */
DFHACK_EXPORT bool containsTile(df::building *bld, df::coord2d tile, bool room = false); DFHACK_EXPORT bool containsTile(df::building *bld, df::coord2d tile);
/** /**
* Checks if the area has support from the terrain. * Checks if the area has support from the terrain.

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

@ -407,7 +407,7 @@ df::building *Buildings::findAtTile(df::coord pos)
if (building && building->z == pos.z && if (building && building->z == pos.z &&
building->isSettingOccupancy() && building->isSettingOccupancy() &&
containsTile(building, pos, false)) containsTile(building, pos))
{ {
return building; return building;
} }
@ -442,24 +442,19 @@ df::building *Buildings::findAtTile(df::coord pos)
static unordered_map<int32_t, df::coord> corner1; static unordered_map<int32_t, df::coord> corner1;
static unordered_map<int32_t, df::coord> corner2; static unordered_map<int32_t, df::coord> corner2;
static void cacheBuilding(df::building *building, bool is_civzone) { static void cacheBuilding(df::building *building) {
int32_t id = building->id; int32_t id = building->id;
df::coord p1(min(building->x1, building->x2), min(building->y1,building->y2), building->z); df::coord p1(min(building->x1, building->x2), min(building->y1,building->y2), building->z);
df::coord p2(max(building->x1, building->x2), max(building->y1,building->y2), building->z); df::coord p2(max(building->x1, building->x2), max(building->y1,building->y2), building->z);
if (!is_civzone) { corner1[id] = p1;
// civzones can be dynamically shrunk so we don't bother to cache corner2[id] = p2;
// their boundaries. findCivzonesAt() will trim the cache as needed.
corner1[id] = p1;
corner2[id] = p2;
}
for (int32_t x = p1.x; x <= p2.x; x++) { for (int32_t x = p1.x; x <= p2.x; x++) {
for (int32_t y = p1.y; y <= p2.y; y++) { for (int32_t y = p1.y; y <= p2.y; y++) {
df::coord pt(x, y, building->z); df::coord pt(x, y, building->z);
if (Buildings::containsTile(building, pt, is_civzone)) { if (Buildings::containsTile(building, pt)) {
if (!is_civzone) locationToBuilding[pt] = id;
locationToBuilding[pt] = id;
} }
} }
} }
@ -868,31 +863,16 @@ int Buildings::countExtentTiles(df::building_extents *ext, int defval)
return cnt; return cnt;
} }
bool Buildings::containsTile(df::building *bld, df::coord2d tile, bool room) bool Buildings::containsTile(df::building *bld, df::coord2d tile) {
{
CHECK_NULL_POINTER(bld); CHECK_NULL_POINTER(bld);
if (room) if (!bld->isExtentShaped() || !bld->room.extents) {
{
/* TODO: understand how this changes for v50
if (!bld->is_room || !bld->room.extents)
return false;
*/
}
else
{
if (tile.x < bld->x1 || tile.x > bld->x2 || tile.y < bld->y1 || tile.y > bld->y2) if (tile.x < bld->x1 || tile.x > bld->x2 || tile.y < bld->y1 || tile.y > bld->y2)
return false; return false;
} }
if (bld->room.extents && (room || bld->isExtentShaped())) df::building_extents_type *etile = getExtentTile(bld->room, tile);
{ return etile && *etile;
df::building_extents_type *etile = getExtentTile(bld->room, tile);
if (!etile || !*etile)
return false;
}
return true;
} }
bool Buildings::hasSupport(df::coord pos, df::coord2d size) bool Buildings::hasSupport(df::coord pos, df::coord2d size)
@ -1491,7 +1471,7 @@ void Buildings::updateBuildings(color_ostream&, void* ptr)
{ {
bool is_civzone = !building->isSettingOccupancy(); bool is_civzone = !building->isSettingOccupancy();
if (!corner1.count(id) && !is_civzone) if (!corner1.count(id) && !is_civzone)
cacheBuilding(building, false); cacheBuilding(building);
} }
else if (corner1.count(id)) else if (corner1.count(id))
{ {
@ -1697,7 +1677,7 @@ StockpileIterator& StockpileIterator::operator++() {
continue; continue;
} }
if (!Buildings::containsTile(stockpile, item->pos, false)) { if (!Buildings::containsTile(stockpile, item->pos)) {
continue; continue;
} }