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

Merge remote-tracking branch 'myk002/myk_help_i_am_my_own_grandpa' into develop

develop
lethosor 2021-01-26 23:53:39 -05:00
parent 2d5eb9c29d 32a0363f31
commit a2ee5e027b
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Fixes
- `embark-assistant`: fixed order of factors when calculating min temperature
- `embark-assistant`: improved performance of surveying
- `quickfort`: creating zones no longer causes eventual crashes
## Misc Improvements
- `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g. ``buildingplan set boulders false``

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

@ -881,7 +881,7 @@ static void linkRooms(df::building *bld)
for (size_t i = 0; i < vec.size(); i++)
{
auto room = vec[i];
if (!room->is_room || room->z != bld->z)
if (!room->is_room || room->z != bld->z || room == bld)
continue;
df::building_extents_type *pext = getExtentTile(room->room, df::coord2d(bld->x1, bld->y1));