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

cleanup: no longer need to apply LOMASK

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@900 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-12-06 16:02:17 +00:00
parent c2286465a7
commit 0d82d3514c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/micropolisj/engine/Bulldozer.java
View file

@ -104,7 +104,7 @@ class Bulldozer extends ToolStroke
int tile = eff.getTile(xx,yy); int tile = eff.getTile(xx,yy);
if (tile == CLEAR) if (tile == CLEAR)
continue; continue;
tile = tile & LOMASK;
if (tile != RADTILE && tile != DIRT) { if (tile != RADTILE && tile != DIRT) {
int z = inPreview ? 0 : city.PRNG.nextInt(3); int z = inPreview ? 0 : city.PRNG.nextInt(3);
int nTile = TINYEXP + z; int nTile = TINYEXP + z;

4
src/micropolisj/engine/TerrainBehavior.java
View file

@ -339,8 +339,8 @@ class TerrainBehavior extends TileBehavior
int x = xpos + Dx[z]; int x = xpos + Dx[z];
int y = ypos + Dy[z]; int y = ypos + Dy[z];
if (city.testBounds(x,y)) { if (city.testBounds(x,y)) {
if ((city.map[y][x] & LOMASK) == (fromTab[z] & LOMASK) || if ((city.getTile(x,y) == fromTab[z]) ||
(city.map[y][x] == CHANNEL) (city.getTile(x,y) == CHANNEL)
) { ) {
city.setTile(x, y, toTab[z]); city.setTile(x, y, toTab[z]);
} }