diff --git a/plugins/zone.cpp b/plugins/zone.cpp index 6e87d75f0..44eb8eb1c 100644 --- a/plugins/zone.cpp +++ b/plugins/zone.cpp @@ -309,6 +309,7 @@ bool isTrained(df::unit* creature); bool isWar(df::unit* creature); bool isHunter(df::unit* creature); bool isOwnCiv(df::unit* creature); +bool isMerchant(df::unit* creature); bool isActivityZone(df::building * building); bool isPenPasture(df::building * building); @@ -344,6 +345,11 @@ bool isDead(df::unit* unit) return unit->flags1.bits.dead; } +bool isMerchant(df::unit* unit) +{ + return unit->flags1.bits.merchant; +} + bool isMarkedForSlaughter(df::unit* unit) { return unit->flags2.bits.slaughter; @@ -1614,6 +1620,9 @@ command_result df_zone (color_ostream &out, vector & parameters) if (isDead(unit)) continue; + // ignore merchant units + if (isMerchant(unit)) + continue; if(find_race && getRaceName(unit) != target_race) continue; // ignore own dwarves by default