From f136a3f4f4363663dc012be7aee3cc6a7b49a066 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Sat, 21 Jun 2014 19:14:31 -0400 Subject: [PATCH] tile-names: let loadMap() handle dyn-numbered tiles --- src/micropolisj/engine/Micropolis.java | 2 +- src/micropolisj/engine/Tiles.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java index 4db7005..25ff7c4 100644 --- a/src/micropolisj/engine/Micropolis.java +++ b/src/micropolisj/engine/Micropolis.java @@ -2137,7 +2137,7 @@ public class Micropolis { int z = dis.readShort(); z &= ~(1024 | 2048 | 4096 | 8192 | 16384); // clear ZONEBIT,ANIMBIT,BULLBIT,BURNBIT,CONDBIT on import - map[y][x] = (char) z; + map[y][x] = (char) Tiles.loadByOrdinal(z).tileNumber; } } } diff --git a/src/micropolisj/engine/Tiles.java b/src/micropolisj/engine/Tiles.java index 14fe1df..1ca541a 100644 --- a/src/micropolisj/engine/Tiles.java +++ b/src/micropolisj/engine/Tiles.java @@ -86,6 +86,11 @@ public class Tiles return tilesByName.get(tileName); } + public static TileSpec loadByOrdinal(int tileNumber) + { + return load(Integer.toString(tileNumber)); + } + /** * Access a tile specification by index number. *