archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup: make both canAutoBulldoze have same logic

Browse source 
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
This commit is contained in:
jason@long.name 2013-05-05 19:03:04 +00:00
parent 32d23d16bd
commit 36f056087e
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/micropolisj/engine/MicropolisTool.java
View file

@ -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;
}