diff --git a/TODO b/TODO index 89ee3b6..a4590da 100644 --- a/TODO +++ b/TODO @@ -17,10 +17,6 @@ Finances- Budget dialog- *Press escape to close -Coal powerplant- - *When third tile of second row is on fire, something appears to revert it to - the animated smoke stack. - On Game Load- *All zones are unpowered for the first several ticks. I'd imagine there are similar problems with the landValueMap, pollutionMap, tfDensity, @@ -39,6 +35,3 @@ Disasters- City size notifications- *Pause and pop up a message the first time the city reaches 2000, 10000, 50000, etc. people. - -Code janitor- - *Rename fireZone() to killZone()... (I think that name might be better description.) diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java index 829905a..619f56f 100644 --- a/src/micropolisj/engine/MapScanner.java +++ b/src/micropolisj/engine/MapScanner.java @@ -193,7 +193,7 @@ class MapScanner int c = city.map[ytem][xtem]; if ((c & BURNBIT) != 0) { if ((c & ZONEBIT) != 0) { - city.fireZone(xtem, ytem, c); + city.killZone(xtem, ytem, c); if ((c & LOMASK) > IZB) { //explode city.makeExplosion(xtem, ytem); } @@ -235,7 +235,7 @@ class MapScanner (t >= WOODS5 && t < FLOOD)) { if ((c & ZONEBIT) != 0) { - city.fireZone(xx, yy, c); + city.killZone(xx, yy, c); } city.setTile(xx, yy, (char)(FLOOD + PRNG.nextInt(3))); } diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java index 7b6096d..1117265 100644 --- a/src/micropolisj/engine/Micropolis.java +++ b/src/micropolisj/engine/Micropolis.java @@ -2361,7 +2361,7 @@ public class Micropolis * since otherwise the user would no longer have a way of destroying * the zone. */ - void fireZone(int xpos, int ypos, int zoneTile) + void killZone(int xpos, int ypos, int zoneTile) { rateOGMem[ypos/8][xpos/8] -= 20; diff --git a/src/micropolisj/engine/Sprite.java b/src/micropolisj/engine/Sprite.java index 00b3bd0..6f105f0 100644 --- a/src/micropolisj/engine/Sprite.java +++ b/src/micropolisj/engine/Sprite.java @@ -183,7 +183,7 @@ public abstract class Sprite return; //cannot destroy it } if ((z & ZONEBIT) != 0) { - city.fireZone(xpos, ypos, z); + city.killZone(xpos, ypos, z); if (t > RZB) { city.makeExplosion(xpos, ypos); }