From 8793847415681f1e8c336d15ac44f3ffe23893af Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sun, 7 Jul 2013 14:11:02 +0000 Subject: [PATCH] TileConstants: simplify logic in isBridge() git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@726 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/Sprite.java | 4 ++-- src/micropolisj/engine/TileConstants.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/micropolisj/engine/Sprite.java b/src/micropolisj/engine/Sprite.java index 8cac75b..a8fb50b 100644 --- a/src/micropolisj/engine/Sprite.java +++ b/src/micropolisj/engine/Sprite.java @@ -175,7 +175,7 @@ public abstract class Sprite int t = z & LOMASK; if (t >= TREEBASE) { - if (TileConstants.isBridge(z)) { + if (isBridge(z)) { city.setTile(xpos, ypos, RIVER); return; } @@ -188,7 +188,7 @@ public abstract class Sprite city.makeExplosion(xpos, ypos); } } - if (TileConstants.checkWet(t)) { + if (checkWet(t)) { city.setTile(xpos, ypos, RIVER); } else { diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index 20b0fd7..defa475 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -293,8 +293,7 @@ public class TileConstants //used by Sprite::destroyTile public static boolean isBridge(int tile) { - return (((tile & LOMASK) >= ROADBASE && (tile & LOMASK) <= LASTROAD) - && !isCombustible(tile)); + return isRoad(tile) && !isCombustible(tile); } public static boolean isCombustible(int tile)