From 6604b266aa8b6de5dc5d8890e5a51122314562d2 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Sun, 21 Sep 2014 14:09:07 -0400 Subject: [PATCH] tiles: eliminate redundant predicate checkWet in favor of isOverWater --- src/micropolisj/engine/Sprite.java | 2 +- src/micropolisj/engine/TileConstants.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/micropolisj/engine/Sprite.java b/src/micropolisj/engine/Sprite.java index 6db107c..c31e0e6 100644 --- a/src/micropolisj/engine/Sprite.java +++ b/src/micropolisj/engine/Sprite.java @@ -194,7 +194,7 @@ public abstract class Sprite city.makeExplosion(xpos, ypos); } } - if (checkWet(t)) { + if (isOverWater(t)) { city.setTile(xpos, ypos, RIVER); } else { diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index a735653..8af0324 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -352,18 +352,6 @@ public class TileConstants } } - public static boolean checkWet(int tile) - { - assert (tile & LOMASK) == tile; - - return (tile == POWERBASE || - tile == POWERBASE+1 || - tile == RAILBASE || - tile == RAILBASE + 1 || - tile == BRWH || - tile == BRWV); - } - public static CityDimension getZoneSizeFor(int tile) { assert isZoneCenter(tile);