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

cleanup: comPlop,indPlop,residentialPlop: use xpos,ypos properties

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

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

@ -1077,7 +1077,7 @@ class MapScanner
if (pop < 5)
{
comPlop(xpos, ypos, pop, value);
comPlop(pop, value);
incrementROG(xpos, ypos, 8);
}
}
@ -1086,7 +1086,7 @@ class MapScanner
{
if (pop < 4)
{
indPlop(xpos, ypos, pop, value);
indPlop(pop, value);
incrementROG(xpos, ypos, 8);
}
}
@ -1111,7 +1111,7 @@ class MapScanner
if (city.getPopulationDensity(xpos, ypos) > 64)
{
residentialPlop(xpos, ypos, 0, value);
residentialPlop(0, value);
incrementROG(xpos, ypos, 8);
return;
}
@ -1120,24 +1120,24 @@ class MapScanner
if (pop < 40)
{
residentialPlop(xpos, ypos, pop / 8 - 1, value);
residentialPlop(pop / 8 - 1, value);
incrementROG(xpos, ypos, 8);
}
}
void comPlop(int xpos, int ypos, int density, int value)
void comPlop(int density, int value)
{
int base = (value * 5 + density) * 9 + CZB - 4;
zonePlop(xpos, ypos, base);
}
void indPlop(int xpos, int ypos, int density, int value)
void indPlop(int density, int value)
{
int base = (value * 4 + density) * 9 + (IZB - 4);
zonePlop(xpos, ypos, base);
}
void residentialPlop(int xpos, int ypos, int density, int value)
void residentialPlop(int density, int value)
{
int base = (value * 4 + density) * 9 + RZB - 4;
zonePlop(xpos, ypos, base);
@ -1147,7 +1147,7 @@ class MapScanner
{
if (pop > 1)
{
comPlop(xpos, ypos, pop-2, value);
comPlop(pop-2, value);
incrementROG(xpos, ypos, -8);
}
else if (pop == 1)
@ -1161,7 +1161,7 @@ class MapScanner
{
if (pop > 1)
{
indPlop(xpos, ypos, pop-2, value);
indPlop(pop-2, value);
incrementROG(xpos, ypos, -8);
}
else if (pop == 1)
@ -1183,7 +1183,7 @@ class MapScanner
if (pop > 16)
{
// downgrade to a lower-density full-size residential zone
residentialPlop(xpos, ypos, (pop-24) / 8, value);
residentialPlop((pop-24) / 8, value);
incrementROG(xpos, ypos, -8);
return;
}