From 1da5fdf40298bb4ca4b6e70ed9b2ac8f2d3e8654 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Sun, 21 Sep 2014 14:30:45 -0400 Subject: [PATCH] cleanup: remove unused isRoad, isRail methods --- src/micropolisj/engine/Sprite.java | 2 +- src/micropolisj/engine/TileConstants.java | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/micropolisj/engine/Sprite.java b/src/micropolisj/engine/Sprite.java index 430657a..0d69aef 100644 --- a/src/micropolisj/engine/Sprite.java +++ b/src/micropolisj/engine/Sprite.java @@ -180,7 +180,7 @@ public abstract class Sprite int t = city.getTile(xpos, ypos); if (isOverWater(t)) { - if (isRoad(t)) { + if (isRoadAny(t)) { // becomes water city.setTile(xpos, ypos, RIVER); } diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index 2ab3683..7f5248a 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -384,17 +384,6 @@ public class TileConstants return (tile == DIRT || (isDozeable(tile) && isCombustible(tile))); } - /** - * Note: does not include rail/road tiles. - * @see #isRoadAny - */ - public static boolean isRoad(int tile) - { - assert (tile & LOMASK) == tile; - - return (tile >= ROADBASE && tile < POWERBASE); - } - public static boolean isRoadAny(int tile) { assert (tile & LOMASK) == tile; @@ -458,13 +447,6 @@ public class TileConstants (tile != VBRIDGE)); } - public static boolean isRail(int tile) - { - assert (tile & LOMASK) == tile; - - return (tile >= RAILBASE && tile < RESBASE); - } - public static boolean isRailAny(int tile) { assert (tile & LOMASK) == tile;