From c272e200bff3c0834aa0f1e24bd8ad0406f8edd4 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Tue, 28 May 2013 01:55:25 +0000 Subject: [PATCH] cleanup: isOverWater() should neutralize traffic, not the caller git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@684 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/Bulldozer.java | 3 +-- src/micropolisj/engine/TileConstants.java | 11 +++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/micropolisj/engine/Bulldozer.java b/src/micropolisj/engine/Bulldozer.java index 2455119..0de76ac 100644 --- a/src/micropolisj/engine/Bulldozer.java +++ b/src/micropolisj/engine/Bulldozer.java @@ -75,8 +75,7 @@ class Bulldozer extends ToolStroke // check dozeable bit assert isDozeable(tile); - tile = neutralizeRoad(tile); - if (isOverWater((char)tile)) + if (isOverWater(tile)) { // dozing over water, replace with water. eff.setTile(0, 0, RIVER); diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index bbf37a4..320b027 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -76,9 +76,9 @@ public class TileConstants public static final char INTERSECTION = 76; public static final char HROADPOWER = 77; public static final char VROADPOWER = 78; - public static final char BRWH = 79; + public static final char BRWH = 79; //horz bridge, open public static final char LTRFBASE = 80; - public static final char BRWV = 95; + public static final char BRWV = 95; //vert bridge, open public static final char HTRFBASE = 144; public static final char LASTROAD = 206; public static final char POWERBASE = 208; @@ -309,9 +309,12 @@ public class TileConstants return (tmp >= RADTILE && tmp < FIREBASE); } - public static boolean isOverWater(char cell) + public static boolean isOverWater(int tile) { - switch (cell & LOMASK) + // Note: BRWV will be converted to BRWH by the following + // function. + int tmp = neutralizeRoad(tile & LOMASK); + switch (tmp) { case HBRIDGE: case VBRIDGE: