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

cleanup: rename FREEZ to RESCLR for consistency

Browse source 
matches the naming pattern used for COMCLR and INDCLR

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@858 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-09-20 11:21:28 +00:00
parent d389124b86
commit 736754a5ab
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -705,7 +705,7 @@ class MapScanner
{ {
if (PRNG.nextInt(21) == 0) if (PRNG.nextInt(21) == 0)
{ {
zonePlop(FREEZ); zonePlop(RESCLR);
} }
} }
} }
@ -721,7 +721,7 @@ class MapScanner
{ {
if (PRNG.nextInt(21) == 0) if (PRNG.nextInt(21) == 0)
{ {
zonePlop(FREEZ); zonePlop(RESCLR);
} }
} }
} }
@ -885,7 +885,7 @@ class MapScanner
city.resZoneCount++; city.resZoneCount++;
int tpop; //population of this zone int tpop; //population of this zone
if (cchr9 == FREEZ) if (cchr9 == RESCLR)
{ {
tpop = city.doFreePop(xpos, ypos); tpop = city.doFreePop(xpos, ypos);
} }
@ -913,7 +913,7 @@ class MapScanner
return; return;
} }
if (cchr9 == FREEZ || PRNG.nextInt(8) == 0) if (cchr9 == RESCLR || PRNG.nextInt(8) == 0)
{ {
int locValve = evalResidential(trafficGood); int locValve = evalResidential(trafficGood);
int zscore = city.resValve + locValve; int zscore = city.resValve + locValve;
@ -1059,7 +1059,7 @@ class MapScanner
return; return;
int cchr9 = cchr & LOMASK; int cchr9 = cchr & LOMASK;
if (cchr9 == FREEZ) if (cchr9 == RESCLR)
{ {
if (pop < 8) if (pop < 8)
{ {
@ -1152,7 +1152,7 @@ class MapScanner
// downgrade from full-size zone to 8 little houses // downgrade from full-size zone to 8 little houses
int pwrBit = (cchr & PWRBIT); int pwrBit = (cchr & PWRBIT);
city.setTile(xpos, ypos, (char)(FREEZ | BULLBIT | pwrBit)); city.setTile(xpos, ypos, (char)(RESCLR | BULLBIT | pwrBit));
for (int x = xpos-1; x <= xpos+1; x++) for (int x = xpos-1; x <= xpos+1; x++)
{ {
for (int y = ypos-1; y <= ypos+1; y++) for (int y = ypos-1; y <= ypos+1; y++)
@ -1188,7 +1188,7 @@ class MapScanner
int loc = city.map[y][x] & LOMASK; int loc = city.map[y][x] & LOMASK;
if (loc >= LHTHR && loc <= HHTHR) if (loc >= LHTHR && loc <= HHTHR)
{ //little house { //little house
city.setTile(x, y, (char)((Brdr[z] + FREEZ - 4) | BULLBIT)); city.setTile(x, y, (char)((Brdr[z] + RESCLR - 4) | BULLBIT));
return; return;
} }
} }

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

@ -609,7 +609,7 @@ public class Micropolis
private int computePopDen(int x, int y, char tile) private int computePopDen(int x, int y, char tile)
{ {
if (tile == FREEZ) if (tile == RESCLR)
return doFreePop(x, y); return doFreePop(x, y);
if (tile < COMBASE) if (tile < COMBASE)

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

@ -115,7 +115,6 @@ public class TileConstants
static final char LASTRAIL = 238; static final char LASTRAIL = 238;
static final char RESBASE = 240; static final char RESBASE = 240;
static final char RESCLR = 244; static final char RESCLR = 244;
static final char FREEZ = 244; //free zone?
static final char HOUSE = 249; static final char HOUSE = 249;
static final char LHTHR = 249; //12 house tiles static final char LHTHR = 249; //12 house tiles
static final char HHTHR = 260; static final char HHTHR = 260;