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

cleanup: getCRValue: document and use xpos,ypos properties

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@555 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-02-18 01:58:01 +00:00
parent ae95b98980
commit 8e9902ef64
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -789,7 +789,7 @@ class MapScanner
if (trafficGood == -1) if (trafficGood == -1)
{ {
int value = getCRValue(xpos, ypos); int value = getCRValue();
doCommercialOut(tpop, value); doCommercialOut(tpop, value);
return; return;
} }
@ -806,14 +806,14 @@ class MapScanner
zscore > -350 && zscore > -350 &&
zscore - 26380 > (PRNG.nextInt(0x10000)-0x8000)) zscore - 26380 > (PRNG.nextInt(0x10000)-0x8000))
{ {
int value = getCRValue(xpos, ypos); int value = getCRValue();
doCommercialIn(tpop, value); doCommercialIn(tpop, value);
return; return;
} }
if (zscore < 350 && zscore + 26380 < (PRNG.nextInt(0x10000)-0x8000)) if (zscore < 350 && zscore + 26380 < (PRNG.nextInt(0x10000)-0x8000))
{ {
int value = getCRValue(xpos, ypos); int value = getCRValue();
doCommercialOut(tpop, value); doCommercialOut(tpop, value);
} }
} }
@ -958,7 +958,7 @@ class MapScanner
if (trafficGood == -1) if (trafficGood == -1)
{ {
int value = getCRValue(xpos, ypos); int value = getCRValue();
doResidentialOut(tpop, value); doResidentialOut(tpop, value);
return; return;
} }
@ -979,14 +979,14 @@ class MapScanner
return; return;
} }
int value = getCRValue(xpos, ypos); int value = getCRValue();
doResidentialIn(tpop, value); doResidentialIn(tpop, value);
return; return;
} }
if (zscore < 350 && zscore + 26380 < (PRNG.nextInt(0x10000)-0x8000)) if (zscore < 350 && zscore + 26380 < (PRNG.nextInt(0x10000)-0x8000))
{ {
int value = getCRValue(xpos, ypos); int value = getCRValue();
doResidentialOut(tpop, value); doResidentialOut(tpop, value);
} }
} }
@ -1298,12 +1298,16 @@ class MapScanner
return value - 3000; return value - 3000;
} }
// applies to commercial and residential zones? /**
// returns integer from 0 to 3 * Gets the land-value class (0-3) for the current
int getCRValue(int x, int y) * residential or commercial zone location.
* @return integer from 0 to 3, 0 is the lowest-valued
* zone, and 3 is the highest-valued zone.
*/
int getCRValue()
{ {
int lval = city.landValueMem[y/2][x/2]; int lval = city.landValueMem[ypos/2][xpos/2];
lval -= city.pollutionMem[y/2][x/2]; lval -= city.pollutionMem[ypos/2][xpos/2];
if (lval < 30) if (lval < 30)
return 0; return 0;