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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/micropolisj/engine/ExplosionSprite.java
View file

@ -54,7 +54,7 @@ public class ExplosionSprite extends Sprite
int z = city.getTile(xpos, ypos); int z = city.getTile(xpos, ypos);
int t = z & LOMASK; int t = z & LOMASK;
if ((z & BURNBIT) == 0 && t != DIRT) if (!isCombustible(z) && t != DIRT)
return; return;
if (isZoneCenter(z)) if (isZoneCenter(z))
return; return;

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

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

@ -1815,7 +1815,7 @@ public class Micropolis
if (isZoneCenter(t)) { if (isZoneCenter(t)) {
continue; continue;
} }
if ((t & BURNBIT) != 0 || t == DIRT) { if (isCombustible(t) || t == DIRT) {
setTile(x, y, RADTILE); setTile(x, y, RADTILE);
} }
} }
@ -2187,7 +2187,7 @@ public class Micropolis
int x = PRNG.nextInt(getWidth()); int x = PRNG.nextInt(getWidth());
int y = PRNG.nextInt(getHeight()); int y = PRNG.nextInt(getHeight());
int tile = map[y][x]; int tile = map[y][x];
if (!isZoneCenter(tile) && (tile & BURNBIT) != 0) if (!isZoneCenter(tile) && isCombustible(tile))
{ {
tile &= LOMASK; tile &= LOMASK;
if (tile > 21 && tile < LASTZONE) { if (tile > 21 && tile < LASTZONE) {

2
src/micropolisj/engine/Sprite.java
View file

@ -179,7 +179,7 @@ public abstract class Sprite
city.setTile(xpos, ypos, RIVER); city.setTile(xpos, ypos, RIVER);
return; return;
} }
if ((z & BURNBIT) == 0) { if (!isCombustible(z)) {
return; //cannot destroy it return; //cannot destroy it
} }
if (isZoneCenter(z)) { if (isZoneCenter(z)) {

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

@ -294,7 +294,12 @@ public class TileConstants
public static boolean isBridge(int tile) public static boolean isBridge(int tile)
{ {
return (((tile & LOMASK) >= ROADBASE && (tile & LOMASK) <= LASTROAD) return (((tile & LOMASK) >= ROADBASE && (tile & LOMASK) <= LASTROAD)
&& ((tile & BURNBIT) == 0)); && !isCombustible(tile));
}
public static boolean isCombustible(int tile)
{
return (tile & BURNBIT) != 0;
} }
public static boolean isFire(int tile) public static boolean isFire(int tile)
@ -413,7 +418,7 @@ public class TileConstants
static boolean isFloodable(int tile) static boolean isFloodable(int tile)
{ {
return (tile == DIRT || ((tile & BULLBIT) != 0 && (tile & BURNBIT) != 0)); return (tile == DIRT || ((tile & BULLBIT) != 0 && isCombustible(tile)));
} }
public static boolean isRoad(int tile) public static boolean isRoad(int tile)