From 0d82d3514c53a8eb5a5d27b2128e80577c19cbc8 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Fri, 6 Dec 2013 16:02:17 +0000 Subject: [PATCH] cleanup: no longer need to apply LOMASK git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@900 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/Bulldozer.java | 2 +- src/micropolisj/engine/TerrainBehavior.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/micropolisj/engine/Bulldozer.java b/src/micropolisj/engine/Bulldozer.java index 7700031..29364e5 100644 --- a/src/micropolisj/engine/Bulldozer.java +++ b/src/micropolisj/engine/Bulldozer.java @@ -104,7 +104,7 @@ class Bulldozer extends ToolStroke int tile = eff.getTile(xx,yy); if (tile == CLEAR) continue; - tile = tile & LOMASK; + if (tile != RADTILE && tile != DIRT) { int z = inPreview ? 0 : city.PRNG.nextInt(3); int nTile = TINYEXP + z; diff --git a/src/micropolisj/engine/TerrainBehavior.java b/src/micropolisj/engine/TerrainBehavior.java index 9e620be..79d6d34 100644 --- a/src/micropolisj/engine/TerrainBehavior.java +++ b/src/micropolisj/engine/TerrainBehavior.java @@ -339,8 +339,8 @@ class TerrainBehavior extends TileBehavior int x = xpos + Dx[z]; int y = ypos + Dy[z]; if (city.testBounds(x,y)) { - if ((city.map[y][x] & LOMASK) == (fromTab[z] & LOMASK) || - (city.map[y][x] == CHANNEL) + if ((city.getTile(x,y) == fromTab[z]) || + (city.getTile(x,y) == CHANNEL) ) { city.setTile(x, y, toTab[z]); }