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

cleanup: drawStadium: use xpos,ypos properties instead of function arguments

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

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

@ -607,7 +607,7 @@ class MapScanner
if (powerOn) if (powerOn)
{ {
if (((city.cityTime + xpos + ypos) % 32) == 0) { if (((city.cityTime + xpos + ypos) % 32) == 0) {
drawStadium(xpos, ypos, FULLSTADIUM); drawStadium(FULLSTADIUM);
city.setTile(xpos+1,ypos, (char)(FOOTBALLGAME1 | ANIMBIT)); city.setTile(xpos+1,ypos, (char)(FOOTBALLGAME1 | ANIMBIT));
city.setTile(xpos+1,ypos+1,(char)(FOOTBALLGAME2 | ANIMBIT)); city.setTile(xpos+1,ypos+1,(char)(FOOTBALLGAME2 | ANIMBIT));
} }
@ -617,7 +617,7 @@ class MapScanner
case FULLSTADIUM: case FULLSTADIUM:
city.stadiumCount++; city.stadiumCount++;
if (((city.cityTime + xpos + ypos) % 8) == 0) { if (((city.cityTime + xpos + ypos) % 8) == 0) {
drawStadium(xpos, ypos, STADIUM); drawStadium(STADIUM);
} }
return; return;
@ -1356,14 +1356,20 @@ class MapScanner
city.rateOGMem[ypos/8][xpos/8] += 4*amount; city.rateOGMem[ypos/8][xpos/8] += 4*amount;
} }
void drawStadium(int mapx, int mapy, int z) /**
* Place tiles for a stadium (full or empty).
* @param zoneCenter either STADIUM or FULLSTADIUM
*/
void drawStadium(int zoneCenter)
{ {
z -= 5; int zoneBase = zoneCenter - 1 - 4;
for (int y = mapy-1; y < mapy+3; y++) { for (int y = 0; y < 4; y++)
for (int x = mapx-1; x < mapx+3; x++) { {
city.setTile(x, y, (char) (z | BNCNBIT | (x == mapx && y == mapy ? (ZONEBIT|PWRBIT) : 0))); for (int x = 0; x < 4; x++, zoneBase++)
z++; {
city.setTile(xpos - 1 + x, ypos - 1 + y,
(char) (zoneBase | BNCNBIT | (x == 1 && y == 1 ? (ZONEBIT|PWRBIT) : 0)));
} }
} }
} }