From 275139c2d1c2e41ec503755fe2ef9fe44b64238a Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sat, 28 Sep 2013 16:34:17 +0000 Subject: [PATCH] refactor: make public getLandValue() method for accessing landValueMem[] git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@863 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MapScanner.java | 6 +++--- src/micropolisj/engine/Micropolis.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java index f6f8f00..0d394a3 100644 --- a/src/micropolisj/engine/MapScanner.java +++ b/src/micropolisj/engine/MapScanner.java @@ -1030,7 +1030,7 @@ class MapScanner private void doCommercialIn(int pop, int value) { - int z = city.landValueMem[ypos/2][xpos/2] / 32; + int z = city.getLandValue(xpos, ypos) / 32; if (pop > z) return; @@ -1235,7 +1235,7 @@ class MapScanner if (traf < 0) return -3000; - int value = city.landValueMem[ypos/2][xpos/2]; + int value = city.getLandValue(xpos, ypos); value -= city.pollutionMem[ypos/2][xpos/2]; if (value < 0) @@ -1257,7 +1257,7 @@ class MapScanner */ int getCRValue() { - int lval = city.landValueMem[ypos/2][xpos/2]; + int lval = city.getLandValue(xpos, ypos); lval -= city.pollutionMem[ypos/2][xpos/2]; if (lval < 30) diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java index e175cf3..899d3ef 100644 --- a/src/micropolisj/engine/Micropolis.java +++ b/src/micropolisj/engine/Micropolis.java @@ -1058,6 +1058,17 @@ public class Micropolis trfDensity[mapY/2][mapX/2] = z; } + /** Accessor method for landValueMem overlay. */ + public int getLandValue(int xpos, int ypos) + { + if (testBounds(xpos, ypos)) { + return landValueMem[ypos/2][xpos/2]; + } + else { + return 0; + } + } + public int getTrafficDensity(int xpos, int ypos) { if (testBounds(xpos, ypos)) {