From 4717c93039b6f65891f073f62fb9b96c913d433b Mon Sep 17 00:00:00 2001
From: "jason@long.name" <jason@long.name@d9718cc8-9f43-0410-858b-315f434eb58c>
Date: Fri, 4 Oct 2013 12:53:59 +0000
Subject: [PATCH] behaviors: dispatch behavior from mapScan() method

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@870 d9718cc8-9f43-0410-858b-315f434eb58c
---
 src/micropolisj/engine/MapScanner.java | 30 +++++---------
 src/micropolisj/engine/Micropolis.java | 54 ++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java
index 230e50d..7df0c83 100644
--- a/src/micropolisj/engine/MapScanner.java
+++ b/src/micropolisj/engine/MapScanner.java
@@ -18,22 +18,17 @@ import static micropolisj.engine.Micropolis.ZoneType;
  * In each sim cycle each tile will get activated, and this
  * class contains the activation code.
  */
-class MapScanner
+class MapScanner extends TileBehavior
 {
-	final Micropolis city;
-	final Random PRNG;
-	int xpos;
-	int ypos;
-	int rawTile;
-	int tile;
+	final B behavior;
 
-	MapScanner(Micropolis city)
+	MapScanner(Micropolis city, B behavior)
 	{
-		this.city = city;
-		this.PRNG = city.PRNG;
+		super(city);
+		this.behavior = behavior;
 	}
 
-	static enum TileBehaviorEnum
+	public static enum B
 	{
 		FIRE,
 		FLOOD,
@@ -58,16 +53,9 @@ class MapScanner
 	/**
 	 * Activate the tile identified by xpos and ypos properties.
 	 */
-	public void scanTile()
+	public void apply()
 	{
-		tile = rawTile & LOMASK;
-
-		String behaviorStr = getTileBehavior(rawTile);
-		if (behaviorStr == null) {
-			return;
-		}
-
-		switch (TileBehaviorEnum.valueOf(behaviorStr)) {
+		switch (behavior) {
 		case FIRE:
 			doFire();
 			return;
@@ -124,7 +112,7 @@ class MapScanner
 			doSeaport();
 			return;
 		default:
-			throw new Error("Unknown behavior: "+behaviorStr);
+			assert false;
 		}
 	}
 
diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java
index 5b1a909..ab252bc 100644
--- a/src/micropolisj/engine/Micropolis.java
+++ b/src/micropolisj/engine/Micropolis.java
@@ -215,6 +215,7 @@ public class Micropolis
 		PRNG = DEFAULT_PRNG;
 		evaluation = new CityEval(this);
 		init(width, height);
+		initTileBehaviors();
 	}
 
 	protected void init(int width, int height)
@@ -1388,23 +1389,62 @@ public class Micropolis
 			return z;
 	}
 
+	Map<String,TileBehavior> tileBehaviors;
+	void initTileBehaviors()
+	{
+		HashMap<String,TileBehavior> bb;
+		bb = new HashMap<String,TileBehavior>();
+
+		bb.put("FIRE", new MapScanner(this, MapScanner.B.FIRE));
+		bb.put("FLOOD", new MapScanner(this, MapScanner.B.FLOOD));
+		bb.put("RADIOACTIVE", new MapScanner(this, MapScanner.B.RADIOACTIVE));
+		bb.put("ROAD", new MapScanner(this, MapScanner.B.ROAD));
+		bb.put("RAIL", new MapScanner(this, MapScanner.B.RAIL));
+		bb.put("EXPLOSION", new MapScanner(this, MapScanner.B.EXPLOSION));
+		bb.put("RESIDENTIAL", new MapScanner(this, MapScanner.B.RESIDENTIAL));
+		bb.put("HOSPITAL_CHURCH", new MapScanner(this, MapScanner.B.HOSPITAL_CHURCH));
+		bb.put("COMMERCIAL", new MapScanner(this, MapScanner.B.COMMERCIAL));
+		bb.put("INDUSTRIAL", new MapScanner(this, MapScanner.B.INDUSTRIAL));
+		bb.put("COAL", new MapScanner(this, MapScanner.B.COAL));
+		bb.put("NUCLEAR", new MapScanner(this, MapScanner.B.NUCLEAR));
+		bb.put("FIRESTATION", new MapScanner(this, MapScanner.B.FIRESTATION));
+		bb.put("POLICESTATION", new MapScanner(this, MapScanner.B.POLICESTATION));
+		bb.put("STADIUM_EMPTY", new MapScanner(this, MapScanner.B.STADIUM_EMPTY));
+		bb.put("STADIUM_FULL", new MapScanner(this, MapScanner.B.STADIUM_FULL));
+		bb.put("AIRPORT", new MapScanner(this, MapScanner.B.AIRPORT));
+		bb.put("SEAPORT", new MapScanner(this, MapScanner.B.SEAPORT));
+
+		this.tileBehaviors = bb;
+	}
+
 	void mapScan(int x0, int x1)
 	{
-		MapScanner scanner = new MapScanner(this);
-
 		for (int x = x0; x < x1; x++)
 		{
-			scanner.xpos = x;
-
 			for (int y = 0; y < getHeight(); y++)
 			{
-				scanner.ypos = y;
-				scanner.rawTile = map[y][x];
-				scanner.scanTile();
+				mapScanTile(x, y);
 			}
 		}
 	}
 
+	void mapScanTile(int xpos, int ypos)
+	{
+		int rawTile = getTile(xpos, ypos);
+		String behaviorStr = getTileBehavior(rawTile & LOMASK);
+		if (behaviorStr == null) {
+			return; //nothing to do
+		}
+
+		TileBehavior b = tileBehaviors.get(behaviorStr);
+		if (b != null) {
+			b.processTile(xpos, ypos);
+		}
+		else {
+			throw new Error("Unknown behavior: "+behaviorStr);
+		}
+	}
+
 	void generateShip()
 	{
 		int edge = PRNG.nextInt(4);