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

tile animation: use tiles.rc to control termination of coal plant smoke

Browse source 
when the coal plant is killed

Also, this sets up a framework to handle industrial zones in the same way.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@759 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-07-20 21:35:05 +00:00
parent a190bbf88b
commit 0c497aa434
5 changed files with 84 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -456,18 +456,25 @@ class MapScanner
cchr = city.map[ypos][xpos];
cchr9 = (char) (cchr & LOMASK);
if (cchr9 == NUCLEAR ||
boolean oldPower = (cchr & PWRBIT) == PWRBIT;
boolean newPower = (
cchr9 == NUCLEAR ||
cchr9 == POWERPLANT ||
city.hasPower(xpos,ypos))
city.hasPower(xpos,ypos)
);
if (newPower && !oldPower)
{
city.setTile(xpos, ypos, (char) (cchr | PWRBIT));
return true;
city.powerZone(xpos, ypos, getZoneSizeFor(cchr));
}
else
else if (!newPower && oldPower)
{
city.setTile(xpos, ypos, (char) (cchr & (~PWRBIT)));
return false;
city.shutdownZone(xpos, ypos, getZoneSizeFor(cchr));
}
return newPower;
}
/**
@ -528,7 +535,6 @@ class MapScanner
}
city.powerPlants.add(new CityLocation(xpos,ypos));
coalSmoke();
return;
case NUCLEAR:
@ -1322,26 +1328,6 @@ class MapScanner
return 3;
}
/**
* Process the coal powerplant animation.
* Note: pollution is not accumulated here; see ptlScan()
* instead.
*/
void coalSmoke()
{
for (int dx = -1; dx <= 2; dx++) {
for (int dy = -1; dy <= 2; dy++) {
int tile = city.getTile(xpos+dx, ypos+dy);
TileSpec ts = Tiles.get(tile & LOMASK);
if (ts != null && ts.onPower != null) {
city.setTile(xpos + dx, ypos + dy,
(char) (ts.onPower.tileNumber | (tile & ALLBITS))
);
}
}
}
}
/**
* Record a zone's population change to the rate-of-growth
* map.