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

cleanup: repairZone should use xpos,ypos properties

Browse source 
instead of using function parameters

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@549 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-02-18 01:57:21 +00:00
parent 889676d9e2
commit de8b27d10a
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -520,7 +520,7 @@ class MapScanner
case POWERPLANT: case POWERPLANT:
city.coalCount++; city.coalCount++;
if ((city.cityTime % 8) == 0) { if ((city.cityTime % 8) == 0) {
repairZone(xpos, ypos, POWERPLANT, 4); repairZone(POWERPLANT, 4);
} }
city.powerPlants.add(new CityLocation(xpos,ypos)); city.powerPlants.add(new CityLocation(xpos,ypos));
@ -535,7 +535,7 @@ class MapScanner
city.nuclearCount++; city.nuclearCount++;
if ((city.cityTime % 8) == 0) { if ((city.cityTime % 8) == 0) {
repairZone(xpos, ypos, NUCLEAR, 4); repairZone(NUCLEAR, 4);
} }
city.powerPlants.add(new CityLocation(xpos, ypos)); city.powerPlants.add(new CityLocation(xpos, ypos));
@ -545,7 +545,7 @@ class MapScanner
{ {
city.fireStationCount++; city.fireStationCount++;
if ((city.cityTime % 8) == 0) { if ((city.cityTime % 8) == 0) {
repairZone(xpos, ypos, FIRESTATION, 3); repairZone(FIRESTATION, 3);
} }
int z; int z;
@ -569,7 +569,7 @@ class MapScanner
{ {
city.policeCount++; city.policeCount++;
if ((city.cityTime % 8) == 0) { if ((city.cityTime % 8) == 0) {
repairZone(xpos, ypos, POLICESTATION, 3); repairZone(POLICESTATION, 3);
} }
int z; int z;
@ -592,7 +592,7 @@ class MapScanner
case STADIUM: case STADIUM:
city.stadiumCount++; city.stadiumCount++;
if ((city.cityTime % 16) == 0) { if ((city.cityTime % 16) == 0) {
repairZone(xpos, ypos, STADIUM, 4); repairZone(STADIUM, 4);
} }
if (powerOn) if (powerOn)
@ -615,7 +615,7 @@ class MapScanner
case AIRPORT: case AIRPORT:
city.airportCount++; city.airportCount++;
if ((city.cityTime % 8) == 0) { if ((city.cityTime % 8) == 0) {
repairZone(xpos, ypos, AIRPORT, 6); repairZone(AIRPORT, 6);
} }
if (powerOn) if (powerOn)
@ -639,7 +639,7 @@ class MapScanner
case PORT: case PORT:
city.seaportCount++; city.seaportCount++;
if ((city.cityTime % 16) == 0) { if ((city.cityTime % 16) == 0) {
repairZone(xpos, ypos, PORT, 4); repairZone(PORT, 4);
} }
if (powerOn && !city.hasSprite(SpriteKind.SHI)) { if (powerOn && !city.hasSprite(SpriteKind.SHI)) {
@ -684,7 +684,7 @@ class MapScanner
if (city.cityTime % 16 == 0) if (city.cityTime % 16 == 0)
{ {
repairZone(xpos, ypos, HOSPITAL, 3); repairZone(HOSPITAL, 3);
} }
if (city.needHospital == -1) //too many hospitals if (city.needHospital == -1) //too many hospitals
{ {
@ -700,7 +700,7 @@ class MapScanner
if (city.cityTime % 16 == 0) if (city.cityTime % 16 == 0)
{ {
repairZone(xpos, ypos, CHURCH, 3); repairZone(CHURCH, 3);
} }
if (city.needChurch == -1) //too many churches if (city.needChurch == -1) //too many churches
{ {
@ -712,7 +712,15 @@ class MapScanner
} }
} }
void repairZone(int xpos, int ypos, char zoneCenter, int zoneSize) /**
* Regenerate the tiles that make up the zone, repairing from
* fire, etc.
* Only tiles that aren't rubble will be regenerated.
* @param zoneCenter the tile value for the "center" tile of the zone
* @param zoneSize integer (3-6) indicating the width/height of
* the zone.
*/
void repairZone(char zoneCenter, int zoneSize)
{ {
int cnt=0; int cnt=0;
for (int y = 0; y < zoneSize; y++) for (int y = 0; y < zoneSize; y++)