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

Merge pull request #2807 from Bumber64/patch-1 

Update Units::isFortControlled
develop
Myk 2023-02-05 15:43:31 -08:00 committed by GitHub
parent 87931d99f6 8253505e4f
commit 3ca2521ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 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:
## New Plugins ## New Plugins
## Fixes ## Fixes
- ``Units::isFortControlled``: Account for agitated wildlife
## Misc Improvements ## Misc Improvements
- `automelt`: is now more resistent to savegame corruption - `automelt`: is now more resistent to savegame corruption

3
library/modules/Units.cpp
Unescape Escape View File

@ -175,7 +175,8 @@ bool Units::isFortControlled(df::unit *unit)
if (unit->flags2.bits.visitor || if (unit->flags2.bits.visitor ||
unit->flags2.bits.visitor_uninvited || unit->flags2.bits.visitor_uninvited ||
unit->flags2.bits.underworld || unit->flags2.bits.underworld ||
unit->flags2.bits.resident) unit->flags2.bits.resident ||
unit->flags4.bits.agitated_wilderness_creature)
return false; return false;
return unit->civ_id != -1 && unit->civ_id == plotinfo->civ_id; return unit->civ_id != -1 && unit->civ_id == plotinfo->civ_id;