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

TileConstants: impl isIndestructible2(), slightly different than isIndestructible()

Browse source 
the difference is whether RUBBLE is included or not;
TODO- make a better name

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@799 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-08-24 21:04:36 +00:00
parent aa40fc8760
commit 51973f75bd
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -503,8 +503,7 @@ class MapScanner
{ {
for (int x = xpos-1; x <= xpos+1; x++) for (int x = xpos-1; x <= xpos+1; x++)
{ {
char c = (char)(city.map[y][x] & LOMASK); if (isIndestructible2(city.getTile(x,y))) {
if (c >= FLOOD && c < ROADBASE) {
// radioactive, on fire, or flooded // radioactive, on fire, or flooded
return false; return false;
} }

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

@ -336,12 +336,20 @@ public class TileConstants
return (tmp >= FIREBASE && tmp < ROADBASE); return (tmp >= FIREBASE && tmp < ROADBASE);
} }
/** Used in repairZone(). */
public static boolean isIndestructible(int tile) public static boolean isIndestructible(int tile)
{ {
int tmp = tile & LOMASK; int tmp = tile & LOMASK;
return tmp >= RUBBLE && tmp < ROADBASE; return tmp >= RUBBLE && tmp < ROADBASE;
} }
/** Used in zonePlop(). */
public static boolean isIndestructible2(int tile)
{
int tmp = tile & LOMASK;
return tmp >= FLOOD && tmp < ROADBASE;
}
public static boolean isRadioactive(int tile) public static boolean isRadioactive(int tile)
{ {
int tmp = tile & LOMASK; int tmp = tile & LOMASK;