From 07bc48c34c9000bdfae0f5f523ad71a54c6811f7 Mon Sep 17 00:00:00 2001
From: "jason@long.name" <jason@long.name@d9718cc8-9f43-0410-858b-315f434eb58c>
Date: Sun, 1 Sep 2013 21:33:28 +0000
Subject: [PATCH] cleanup: consolidate all doFire() functionality into doFire()
 method

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@828 d9718cc8-9f43-0410-858b-315f434eb58c
---
 src/micropolisj/engine/MapScanner.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/micropolisj/engine/MapScanner.java b/src/micropolisj/engine/MapScanner.java
index 2de4907..6365fdd 100644
--- a/src/micropolisj/engine/MapScanner.java
+++ b/src/micropolisj/engine/MapScanner.java
@@ -40,12 +40,7 @@ class MapScanner
 	{
 		if (isFire(cchr))
 		{
-			city.firePop++;
-			if (PRNG.nextInt(4) == 0)
-			{
-				// one in four times
-				doFire();
-			}
+			doFire();
 			return;
 		}
 		else if (isFlood(cchr))
@@ -163,6 +158,13 @@ class MapScanner
 	 */
 	void doFire()
 	{
+		city.firePop++;
+
+		// one in four times
+		if (PRNG.nextInt(4) != 0) {
+			return;
+		}
+
 		final int [] DX = { 0, 1, 0, -1 };
 		final int [] DY = { -1, 0, 1, 0 };