diff options
| author | Kelly Martin | 2012-04-07 23:25:40 -0500 |
|---|---|---|
| committer | Kelly Martin | 2012-04-07 23:25:40 -0500 |
| commit | de960e65f5557b2a49b015d354cdad88d4e6578e (patch) | |
| tree | 0b49aafee4bde005090bccf19c55b47540ab9763 /plugins/zone.cpp | |
| parent | 2e6ee0ac849e13b463e63ff5cd1dc8faad8480ba (diff) | |
| download | dfhack-de960e65f5557b2a49b015d354cdad88d4e6578e.tar.gz dfhack-de960e65f5557b2a49b015d354cdad88d4e6578e.tar.bz2 dfhack-de960e65f5557b2a49b015d354cdad88d4e6578e.tar.xz | |
Stealing animals from traders is bad.
Diffstat (limited to 'plugins/zone.cpp')
| -rw-r--r-- | plugins/zone.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/plugins/zone.cpp b/plugins/zone.cpp index 6e87d75f..44eb8eb1 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 <string> & 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 |
