From 0f2c2f4617eb188921fc8bdd3d0ecfcc01cef661 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sun, 1 Sep 2013 21:33:38 +0000 Subject: [PATCH] refactor: checkZonePower() to set PWR bit and count zones git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@829 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MapScanner.java | 27 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java index 6365fdd..be3ca2a 100644 --- a/src/micropolisj/engine/MapScanner.java +++ b/src/micropolisj/engine/MapScanner.java @@ -415,16 +415,7 @@ class MapScanner void doZone() { // set power bit in map, from powermap - boolean zonePwrFlag = setZonePower(); - - if (zonePwrFlag) - { - city.poweredZoneCount++; - } - else - { - city.unpoweredZoneCount++; - } + boolean zonePwrFlag = checkZonePower(); if (isSpecialZone(cchr)) { @@ -455,6 +446,22 @@ class MapScanner return; } + boolean checkZonePower() + { + boolean zonePwrFlag = setZonePower(); + + if (zonePwrFlag) + { + city.poweredZoneCount++; + } + else + { + city.unpoweredZoneCount++; + } + + return zonePwrFlag; + } + boolean setZonePower() { // refresh cchr, cchr9, since this can get called after the