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

tiles.rc: use description numbers from tiles.rc rather than hardcoded numbers

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@821 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-09-01 16:32:25 +00:00
parent 52512c8987
commit 521a41f028
4 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,16 +208,6 @@ public class TileConstants
private TileConstants() {}
private static int [] buildingBases = {
DIRT, RIVER, TREEBASE, RUBBLE,
FLOOD, RADTILE, FIRE, ROADBASE,
POWERBASE, RAILBASE, RESBASE, COMBASE,
INDBASE, PORTBASE, AIRPORTBASE, COALBASE,
FIRESTBASE, POLICESTBASE, STADIUMBASE, NUCLEARBASE,
HBRDG0, RADAR_ANIM, FOUNTAIN, INDBASE2,
FOOTBALLGAME1, VBRDG0, URANIUM_FUEL, LAST_TILE
};
/**
* Checks whether the tile can be auto-bulldozed for
* placement of road, rail, or wire.
@ -253,14 +243,15 @@ public class TileConstants
}
//used by queryZoneStatus
public static int getBuildingId(int tile)
public static int getDescriptionNumber(int tile)
{
tile &= LOMASK;
int i = Arrays.binarySearch(buildingBases, tile);
if (i >= 0) {
return i;
} else {
return -i - 2;
TileSpec ts = Tiles.get(tile);
if (ts != null) {
return ts.getDescriptionNumber();
}
else {
return -1;
}
}