summaryrefslogtreecommitdiff
path: root/plugins/zone.cpp
diff options
context:
space:
mode:
authorRobert Heinrich2012-04-02 16:58:12 +0200
committerRobert Heinrich2012-04-02 16:58:12 +0200
commit9cc2040a6bcd001bb028f74b25a146fa40ed914d (patch)
tree11b367dbcbfa45b739be984e5eb9131b10b89cb0 /plugins/zone.cpp
parent0f7e380e1b1524e19ab7efd3af488fa15e664b52 (diff)
downloaddfhack-9cc2040a6bcd001bb028f74b25a146fa40ed914d.tar.gz
dfhack-9cc2040a6bcd001bb028f74b25a146fa40ed914d.tar.bz2
dfhack-9cc2040a6bcd001bb028f74b25a146fa40ed914d.tar.xz
minor fix in zone tool: ignore dead units
Diffstat (limited to 'plugins/zone.cpp')
-rw-r--r--plugins/zone.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index eb9a1e80..03c38b10 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -111,7 +111,7 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
///////////////
// Various small tool functions
-//
+// probably many of these should be moved to Unit.h and Building.h sometime later...
int32_t getCreatureAge(df::unit* unit);
bool isTame(df::unit* unit);
bool isTrained(df::unit* unit);
@@ -147,6 +147,14 @@ int32_t getUnitAge(df::unit* unit)
return yearDifference;
}
+bool isDead(df::unit* unit)
+{
+ if(unit->flags1.bits.dead)
+ return true;
+ else
+ return false;
+}
+
bool isTame(df::unit* creature)
{
bool tame = false;
@@ -231,6 +239,9 @@ bool isOwnCiv(df::unit* creature)
// dump some unit info
void unitInfo(color_ostream & out, df::unit* unit, bool list_refs = false)
{
+ if(isDead(unit))
+ return;
+
out.print("Unit %d", unit->id); //race %d, civ %d,", creature->race, creature->civ_id
if(unit->name.has_name)
out << ", name: " << unit->name.first_name << " " << unit->name.nickname;