From f8d3532cf7edc61b0931ed4bfcc005c199b37dcf Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Tue, 3 Dec 2013 02:18:44 +0000 Subject: [PATCH] cleanup: use constants for RivEdge table (in MapGenerator) replace hard-coded numbers with constants and constants plus offsets git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@889 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/engine/MapGenerator.java | 8 ++++---- src/micropolisj/engine/TileConstants.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/micropolisj/engine/MapGenerator.java b/src/micropolisj/engine/MapGenerator.java index 65645ab..5e0ca1f 100644 --- a/src/micropolisj/engine/MapGenerator.java +++ b/src/micropolisj/engine/MapGenerator.java @@ -391,10 +391,10 @@ public class MapGenerator } static final char [] REdTab = new char[] { - 13 + BULLBIT, 13 + BULLBIT, 17 + BULLBIT, 15 + BULLBIT, - 5 + BULLBIT, 2, 19 + BULLBIT, 17 + BULLBIT, - 9 + BULLBIT, 11 + BULLBIT, 2, 13 + BULLBIT, - 7 + BULLBIT, 9 + BULLBIT, 5 + BULLBIT, 2 + (RIVEDGE+8) + BULLBIT, (RIVEDGE+8) + BULLBIT, (RIVEDGE+12)+ BULLBIT, (RIVEDGE+10)+ BULLBIT, + (RIVEDGE+0) + BULLBIT, RIVER, (RIVEDGE+14)+ BULLBIT, (RIVEDGE+12)+ BULLBIT, + (RIVEDGE+4) + BULLBIT, (RIVEDGE+6) + BULLBIT, RIVER, (RIVEDGE+8) + BULLBIT, + (RIVEDGE+2) + BULLBIT, (RIVEDGE+4) + BULLBIT, (RIVEDGE+0) + BULLBIT, RIVER }; private void smoothRiver() diff --git a/src/micropolisj/engine/TileConstants.java b/src/micropolisj/engine/TileConstants.java index 4fb8705..d93ff0b 100644 --- a/src/micropolisj/engine/TileConstants.java +++ b/src/micropolisj/engine/TileConstants.java @@ -44,6 +44,7 @@ public class TileConstants static final char RIVER = 2; static final char REDGE = 3; static final char CHANNEL = 4; + static final char RIVEDGE = 5; static final char FIRSTRIVEDGE = 5; static final char LASTRIVEDGE = 20; static final char TREEBASE = 21;