summaryrefslogtreecommitdiff
path: root/plugins/zone.cpp
diff options
context:
space:
mode:
authorTimothy Collett2012-09-10 09:19:21 -0400
committerTimothy Collett2012-09-10 09:19:21 -0400
commit274d6038adce5797b58cee78a330eb5d639bf59e (patch)
treea80b541fe5352594f5e2d82da50f0d38ddbfedfe /plugins/zone.cpp
parent270351f510db516811117ab746a563560102c14b (diff)
downloaddfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.gz
dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.bz2
dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.xz
Merge further changes (???)
Diffstat (limited to 'plugins/zone.cpp')
-rw-r--r--plugins/zone.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index ce610128..b5e45f5c 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -792,7 +792,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
bool isActivityZone(df::building * building)
{
if( building->getType() == building_type::Civzone
- && building->getSubtype() == civzone_type::ActivityZone)
+ && building->getSubtype() == (short)civzone_type::ActivityZone)
return true;
else
return false;
@@ -1603,7 +1603,7 @@ void zoneInfo(color_ostream & out, df::building* building, bool verbose)
if(building->getType()!= building_type::Civzone)
return;
- if(building->getSubtype() != civzone_type::ActivityZone)
+ if(building->getSubtype() != (short)civzone_type::ActivityZone)
return;
string name;