cleanup: move tile value comparisons into TileConstants class

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@688 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-05-28 01:55:58 +00:00
parent f5e1793592
commit 873caa361b
2 changed files with 38 additions and 4 deletions

View file

@ -428,30 +428,31 @@ class MapScanner
city.unpoweredZoneCount++;
}
if (cchr9 > PORTBASE)
if (isSpecialZone(cchr))
{
doSpecialZone(zonePwrFlag);
return;
}
if (cchr9 < HOSPITAL)
if (isResidentialZone(cchr))
{
doResidential(zonePwrFlag);
return;
}
if (cchr9 < COMBASE)
if (isHospitalOrChurch(cchr))
{
doHospitalChurch(zonePwrFlag);
return;
}
if (cchr9 < INDBASE)
if (isCommercialZone(cchr))
{
doCommercial(zonePwrFlag);
return;
}
assert isIndustrialZone(cchr);
doIndustrial(zonePwrFlag);
return;
}