From ff84c4809184986c815944c9edc35a376334b4d8 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Thu, 10 Oct 2013 13:31:13 +0000 Subject: [PATCH] cleanup: move code that refreshes tile/rawTile closer to where it is needed git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@874 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MapScanner.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java index 1981b0f..92fd8bc 100644 --- a/src/micropolisj/engine/MapScanner.java +++ b/src/micropolisj/engine/MapScanner.java @@ -107,11 +107,6 @@ class MapScanner extends TileBehavior boolean setZonePower() { - // refresh rawTile, tile, since this can get called after the - // tile's been changed - this.rawTile = city.map[ypos][xpos]; - this.tile = (char) (rawTile & LOMASK); - boolean oldPower = (rawTile & PWRBIT) == PWRBIT; boolean newPower = ( tile == NUCLEAR || @@ -175,6 +170,10 @@ class MapScanner extends TileBehavior } } + // refresh rawTile, tile + this.rawTile = city.map[ypos][xpos]; + this.tile = (char) (rawTile & LOMASK); + setZonePower(); return true; }