From 36f056087eecbd7a9e5b2215edcbb94db5365f87 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sun, 5 May 2013 19:03:04 +0000 Subject: [PATCH] cleanup: make both canAutoBulldoze have same logic formerly, tiles LASTTINYEXP+1 and LASTTINYEXP+2 were considered auto-bulldozable only when laying zones. This inconsistency is not necessary, since LASTTINYEXP+1 and LASTTINYEXP+2 are unused values git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@618 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MicropolisTool.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/micropolisj/engine/MicropolisTool.java b/src/micropolisj/engine/MicropolisTool.java index fae9be8..abb7153 100644 --- a/src/micropolisj/engine/MicropolisTool.java +++ b/src/micropolisj/engine/MicropolisTool.java @@ -337,9 +337,6 @@ public enum MicropolisTool */ static boolean canAutoBulldozeRRW(int tileValue) { - //FIXME- explain why LASTTINYEXP is the upper bound here, - // when the Z-version of this function uses LASTTINYEXP+2 - // can we autobulldoze this tile? return ( (tileValue >= FIRSTRIVEDGE && tileValue <= LASTRUBBLE) || @@ -353,13 +350,12 @@ public enum MicropolisTool */ static boolean canAutoBulldozeZ(char tileValue) { - //FIXME- explain why LASTTINYEXP+2 is the upper bound? //FIXME- what is significance of POWERBASE+2 and POWERBASE+12 ? // can we autobulldoze this tile? if ((tileValue >= FIRSTRIVEDGE && tileValue <= LASTRUBBLE) || (tileValue >= POWERBASE + 2 && tileValue <= POWERBASE + 12) || - (tileValue >= TINYEXP && tileValue <= LASTTINYEXP + 2)) + (tileValue >= TINYEXP && tileValue <= LASTTINYEXP)) { return true; }