From 736754a5ab710d09f8efc058fa8d8ea49194b14c Mon Sep 17 00:00:00 2001
From: "jason@long.name" <jason@long.name@d9718cc8-9f43-0410-858b-315f434eb58c>
Date: Fri, 20 Sep 2013 11:21:28 +0000
Subject: [PATCH] cleanup: rename FREEZ to RESCLR for consistency

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
---
 src/micropolisj/engine/MapScanner.java    | 14 +++++++-------
 src/micropolisj/engine/Micropolis.java    |  2 +-
 src/micropolisj/engine/TileConstants.java |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java
index 93c8592..2fab7ad 100644
--- a/src/micropolisj/engine/MapScanner.java
+++ b/src/micropolisj/engine/MapScanner.java
@@ -705,7 +705,7 @@ class MapScanner
 			{
 				if (PRNG.nextInt(21) == 0)
 				{
-					zonePlop(FREEZ);
+					zonePlop(RESCLR);
 				}
 			}
 		}
@@ -721,7 +721,7 @@ class MapScanner
 			{
 				if (PRNG.nextInt(21) == 0)
 				{
-					zonePlop(FREEZ);
+					zonePlop(RESCLR);
 				}
 			}
 		}
@@ -885,7 +885,7 @@ class MapScanner
 		city.resZoneCount++;
 
 		int tpop; //population of this zone
-		if (cchr9 == FREEZ)
+		if (cchr9 == RESCLR)
 		{
 			tpop = city.doFreePop(xpos, ypos);
 		}
@@ -913,7 +913,7 @@ class MapScanner
 			return;
 		}
 
-		if (cchr9 == FREEZ || PRNG.nextInt(8) == 0)
+		if (cchr9 == RESCLR || PRNG.nextInt(8) == 0)
 		{
 			int locValve = evalResidential(trafficGood);
 			int zscore = city.resValve + locValve;
@@ -1059,7 +1059,7 @@ class MapScanner
 			return;
 
 		int cchr9 = cchr & LOMASK;
-		if (cchr9 == FREEZ)
+		if (cchr9 == RESCLR)
 		{
 			if (pop < 8)
 			{
@@ -1152,7 +1152,7 @@ class MapScanner
 			// downgrade from full-size zone to 8 little houses
 
 			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 y = ypos-1; y <= ypos+1; y++)
@@ -1188,7 +1188,7 @@ class MapScanner
 						int loc = city.map[y][x] & LOMASK;
 						if (loc >= LHTHR && loc <= HHTHR)
 						{ //little house
-							city.setTile(x, y, (char)((Brdr[z] + FREEZ - 4) | BULLBIT));
+							city.setTile(x, y, (char)((Brdr[z] + RESCLR - 4) | BULLBIT));
 							return;
 						}
 					}
diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java
index cc1d292..35ecd18 100644
--- a/src/micropolisj/engine/Micropolis.java
+++ b/src/micropolisj/engine/Micropolis.java
@@ -609,7 +609,7 @@ public class Micropolis
 
 	private int computePopDen(int x, int y, char tile)
 	{
-		if (tile == FREEZ)
+		if (tile == RESCLR)
 			return doFreePop(x, y);
 
 		if (tile < COMBASE)
diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java
index c8e86f7..37275e7 100644
--- a/src/micropolisj/engine/TileConstants.java
+++ b/src/micropolisj/engine/TileConstants.java
@@ -115,7 +115,6 @@ public class TileConstants
 	static final char LASTRAIL = 238;
 	static final char RESBASE = 240;
 	static final char RESCLR = 244;
-	static final char FREEZ = 244;  //free zone?
 	static final char HOUSE = 249;
 	static final char LHTHR = 249;  //12 house tiles
 	static final char HHTHR = 260;