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

TileConstants: implement isCombustible()

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@725 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-07-07 13:16:54 +00:00
parent 94dc4ea7be
commit 6406c12c14
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/micropolisj/engine/MapScanner.java
View file

@ -132,7 +132,7 @@ class MapScanner
}
}
if ((cchr & BURNBIT) == 0) //bridge
if (!isCombustible(cchr)) //bridge
{
city.roadTotal += 4;
if (doBridge())
@ -185,7 +185,7 @@ class MapScanner
continue;
int c = city.map[ytem][xtem];
if ((c & BURNBIT) != 0) {
if (isCombustible(c)) {
if (isZoneCenter(c)) {
city.killZone(xtem, ytem, c);
if ((c & LOMASK) > IZB) { //explode
@ -225,7 +225,7 @@ class MapScanner
if (city.testBounds(xx, yy)) {
int c = city.getTile(xx, yy);
int t = c & LOMASK;
if (((c & BURNBIT) != 0) || c == DIRT ||
if (isCombustible(c) || c == DIRT ||
(t >= WOODS5 && t < FLOOD))
{
if (isZoneCenter(c)) {