From aa40fc8760e2763ceaa302b1607a6ea700b10976 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sat, 24 Aug 2013 20:54:23 +0000 Subject: [PATCH] TileConstants: make isIndestructible() continuing the trend of moving tile number logic to centralized location git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@798 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MapScanner.java | 7 ++----- src/micropolisj/engine/TileConstants.java | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java index 9e1272c..b126795 100644 --- a/src/micropolisj/engine/MapScanner.java +++ b/src/micropolisj/engine/MapScanner.java @@ -746,13 +746,10 @@ class MapScanner if (isAnimated(thCh)) continue; - thCh &= LOMASK; - if (thCh < RUBBLE || thCh >= ROADBASE) + if (!isIndestructible(thCh)) { //not rubble, radiactive, on fire or flooded - city.setTile(xx,yy,(char) - (zoneBase) - ); + city.setTile(xx,yy,(char) zoneBase); } } } diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index 2bb596e..25ce7f2 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -336,6 +336,12 @@ public class TileConstants return (tmp >= FIREBASE && tmp < ROADBASE); } + public static boolean isIndestructible(int tile) + { + int tmp = tile & LOMASK; + return tmp >= RUBBLE && tmp < ROADBASE; + } + public static boolean isRadioactive(int tile) { int tmp = tile & LOMASK;