From c3e677047ae0eb28658a40fc79ada4e5704cb3be Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Thu, 5 Sep 2013 11:23:07 +0000 Subject: [PATCH] strictness: getZoneSizeFor must be called on a zone-center tile git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@844 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/TileConstants.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index 8664bd2..376d886 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -398,11 +398,10 @@ public class TileConstants public static CityDimension getZoneSizeFor(int tile) { + assert isZoneCenter(tile); + TileSpec spec = Tiles.get(tile & LOMASK); - if (spec.owner != null) { - spec = spec.owner; - } - return spec.getBuildingSize(); + return spec != null ? spec.getBuildingSize() : null; } public static boolean isConstructed(int tile)