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

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

@ -2549,7 +2549,7 @@ public class Micropolis
public ZoneStatus queryZoneStatus(int xpos, int ypos) public ZoneStatus queryZoneStatus(int xpos, int ypos)
{ {
ZoneStatus zs = new ZoneStatus(); ZoneStatus zs = new ZoneStatus();
zs.building = getBuildingId(getTile(xpos, ypos)); zs.building = getDescriptionNumber(getTile(xpos, ypos));
int z; int z;
z = (popDensity[ypos/2][xpos/2] / 64) % 4; z = (popDensity[ypos/2][xpos/2] / 64) % 4;

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

@ -208,16 +208,6 @@ public class TileConstants
private 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 * Checks whether the tile can be auto-bulldozed for
* placement of road, rail, or wire. * placement of road, rail, or wire.
@ -253,14 +243,15 @@ public class TileConstants
} }
//used by queryZoneStatus //used by queryZoneStatus
public static int getBuildingId(int tile) public static int getDescriptionNumber(int tile)
{ {
tile &= LOMASK; tile &= LOMASK;
int i = Arrays.binarySearch(buildingBases, tile); TileSpec ts = Tiles.get(tile);
if (i >= 0) { if (ts != null) {
return i; return ts.getDescriptionNumber();
} else { }
return -i - 2; else {
return -1;
} }
} }

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

@ -106,11 +106,6 @@ public class Tiles
{ {
for (int i = 0; i < tiles.length; i++) { for (int i = 0; i < tiles.length; i++) {
// do something here // do something here
int old = TileConstants.getBuildingId(i);
int n = Tiles.get(i).getDescriptionNumber();
if (old != n) {
System.err.println("Tile "+i+": expected "+old+" but got "+n);
}
} }
} }
} }

2
src/micropolisj/gui/NotificationPane.java
View file

@ -114,7 +114,7 @@ public class NotificationPane extends JPanel
headerLbl.setText(strings.getString("notification.query_hdr")); headerLbl.setText(strings.getString("notification.query_hdr"));
headerLbl.setBackground(QUERY_COLOR); headerLbl.setBackground(QUERY_COLOR);
String buildingStr = s_strings.getString("zone."+zone.building); String buildingStr = zone.building != -1 ? s_strings.getString("zone."+zone.building) : "";
String popDensityStr = s_strings.getString("status."+zone.popDensity); String popDensityStr = s_strings.getString("status."+zone.popDensity);
String landValueStr = s_strings.getString("status."+zone.landValue); String landValueStr = s_strings.getString("status."+zone.landValue);
String crimeLevelStr = s_strings.getString("status."+zone.crimeLevel); String crimeLevelStr = s_strings.getString("status."+zone.crimeLevel);