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

tiles.rc: move BURNBIT knowledge from source code to tiles.rc

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@743 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-07-20 21:10:40 +00:00
parent cc4ba189ce
commit c2cfeb540c
8 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -210,7 +210,7 @@ public class TileConstants
//
public static final char PWRBIT = 32768; // bit 15 ... currently powered
public static final char CONDBIT = 16384; // bit 14 ... can conduct power
public static final char BURNBIT = 8192; // bit 13 ... is combustible
// bit 13 ... unused
public static final char BULLBIT = 4096; // bit 12 ... is bulldozable
// bit 11 ... unused
// bit 10 ... unused
@ -300,7 +300,8 @@ public class TileConstants
public static boolean isCombustible(int tile)
{
return (tile & BURNBIT) != 0;
TileSpec spec = Tiles.get(tile & LOMASK);
return spec != null && spec.canBurn;
}
public static boolean isFire(int tile)