archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TileConstants: remove hardcoded tile values from OverlayMapView

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@787 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-08-11 22:43:13 +00:00
parent 9c6e987f65
commit 9e9d1b2e9b
2 changed files with 65 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/micropolisj/gui/OverlayMapView.java
View file

@ -301,26 +301,38 @@ public class OverlayMapView extends JComponent
int tile = engine.getTile(x,y) & LOMASK;
switch (mapState) {
case RESIDENTIAL:
if (tile >= COMBASE) { tile = DIRT; }
if (isZoneAny(tile) &&
!isResidentialZone(tile) &&
!isHospitalOrChurch(tile))
{
tile = DIRT;
}
break;
case COMMERCIAL:
if (tile > COMLAST || (tile >= RESBASE && tile < COMBASE)) { tile = DIRT; }
if (isZoneAny(tile) &&
!isCommercialZone(tile))
{
tile = DIRT;
}
break;
case INDUSTRIAL:
if ((tile >= RESBASE && tile < INDBASE) ||
(tile >= PORTBASE && tile < SMOKEBASE) ||
(tile >= TINYEXP && tile < 884) ||
tile >= FOOTBALLGAME1)
{ tile = DIRT; }
if (isZoneAny(tile) &&
!isIndustrialZone(tile))
{
tile = DIRT;
}
break;
case POWER_OVERLAY:
tile = checkPower(img, x, y, engine.getTile(x,y));
break;
case TRANSPORT:
case TRAFFIC_OVERLAY:
if (tile >= RESBASE ||
(tile >= 207 && tile <= LVPOWER10) ||
tile == 223) { tile = DIRT; }
if (isConstructed(tile)
&& !isRoadAny(tile)
&& !isRailAny(tile))
{
tile = DIRT;
}
break;
default:
}