Skip to content

[Units] exclude inactive units from inBox functions #5290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myk002 merged 1 commit into from
Feb 21, 2025
Merged

[Units] exclude inactive units from inBox functions #5290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Template for new versions:
## API
- ``Military::removeFromSquad``: removes unit from any squad assignments
- ``Buildings::checkFreeTiles``: now replaces the extents parameter for a building pointer
- ``Units::isUnitInBox``, ``Units::getUnitsInBox``: don't include inactive units

## Lua
- ``dfhack.units.setAutomaticProfessions``: sets unit labors according to current work detail settings
Expand Down
4 changes: 3 additions & 1 deletion library/modules/Units.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,8 @@ bool Units::isGreatDanger(df::unit *unit) {

bool Units::isUnitInBox(df::unit *u, const cuboid &box) {
CHECK_NULL_POINTER(u);
if (!isActive(u))
return false;
return box.containsPos(getPosition(u));
}

Expand All @@ -674,7 +676,7 @@ bool Units::getUnitsInBox(vector<df::unit *> &units, const cuboid &box, std::fun

units.clear();
for (auto unit : world->units.active)
if (filter(unit) && isUnitInBox(unit, box))
if (isUnitInBox(unit, box) && filter(unit))
units.push_back(unit);
return true;
}
Expand Down