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

fix Units::isCitizen 

fixes a lot of issues where plugins ignore non-dwarf citizens and work
with dwarf mercenaries and bards, where it shouldnot
develop
sv-esk 2016-03-04 22:19:54 +02:00
parent 8eb39cc1d0
commit 9da79544de
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -818,26 +818,22 @@ bool Units::isCitizen(df::unit *unit)
// except that the game appears to let melancholy/raving // except that the game appears to let melancholy/raving
// dwarves count as citizens. // dwarves count as citizens.
if (!isDwarf(unit) || !isSane(unit))
return false;
if (unit->flags1.bits.marauder || if (unit->flags1.bits.marauder ||
unit->flags1.bits.invader_origin || unit->flags1.bits.invader_origin ||
unit->flags1.bits.active_invader || unit->flags1.bits.active_invader ||
unit->flags1.bits.forest || unit->flags1.bits.forest ||
unit->flags1.bits.merchant || unit->flags1.bits.merchant ||
unit->flags1.bits.diplomat) unit->flags1.bits.diplomat ||
unit->flags2.bits.visitor ||
unit->flags2.bits.visitor_uninvited ||
unit->flags2.bits.underworld ||
unit->flags2.bits.resident)
return false; return false;
if (unit->flags1.bits.tame) if (!isSane(unit))
return true; return false;
return unit->civ_id == ui->civ_id && return isOwnGroup(unit);
unit->civ_id != -1 &&
!unit->flags2.bits.underworld &&
!unit->flags2.bits.resident &&
!unit->flags2.bits.visitor_uninvited &&
!unit->flags2.bits.visitor;
} }
bool Units::isDwarf(df::unit *unit) bool Units::isDwarf(df::unit *unit)
@ -901,7 +897,7 @@ bool Units::isOwnGroup(df::unit* unit)
for (size_t i = 0; i < histfig->entity_links.size(); i++) for (size_t i = 0; i < histfig->entity_links.size(); i++)
{ {
auto link = histfig->entity_links[i]; auto link = histfig->entity_links[i];
if (link->entity_id == ui->group_id && (*link).getType() == df::histfig_entity_link_type::MEMBER) if (link->entity_id == ui->group_id && link->getType() == df::histfig_entity_link_type::MEMBER)
return true; return true;
} }
return false; return false;