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

tiles: remove old isIndustrialZone() function

Browse source 
Note: this old Industrial Zone checking function would erroneously
include the Coal power plant animated smoke.

You could see this bug by selecting "industrial zones" for the
overlay map, and looking closely where your coal power plants are.
You will see that the coal power plant is invisible in the overlay
except for the four tiles containing the smoke.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@816 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-09-01 00:26:44 +00:00
parent 14944850b7
commit fb6db46fde
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/micropolisj/engine/TileConstants.java
View file

@ -662,6 +662,11 @@ public class TileConstants
(tile & LOMASK) < COMBASE; (tile & LOMASK) < COMBASE;
} }
/**
* Checks whether the tile is defined with the "industrial-zone" attribute.
* Note: the old version of this function erroneously included the coal power
* plant smoke as an industrial zone.
*/
public static boolean isIndustrialZone(int tile) public static boolean isIndustrialZone(int tile)
{ {
int tmp = tile & LOMASK; int tmp = tile & LOMASK;
@ -675,14 +680,6 @@ public class TileConstants
return false; return false;
} }
public static boolean isIndustrialZoneOld(int tile)
{
int tmp = tile & LOMASK;
return (tmp >= INDBASE && tmp < PORTBASE)
|| (tmp >= SMOKEBASE && tmp < TINYEXP)
|| (tmp >= SMOKEBASE2 && tmp < FOOTBALLGAME1);
}
public static boolean isResidentialClear(int tile) public static boolean isResidentialClear(int tile)
{ {
return (tile & LOMASK) >= RESBASE && (tile & LOMASK) <= RESBASE+8; return (tile & LOMASK) >= RESBASE && (tile & LOMASK) <= RESBASE+8;

4
src/micropolisj/engine/Tiles.java
View file

@ -105,9 +105,7 @@ public class Tiles
static void checkTiles() static void checkTiles()
{ {
for (int i = 0; i < tiles.length; i++) { for (int i = 0; i < tiles.length; i++) {
if (TileConstants.isIndustrialZone(i) != TileConstants.isIndustrialZoneOld(i)) { // do something here
System.err.println("industrial zone disagreement: "+i);
}
} }
} }
} }