From 98a2b4b0070d174bc07d79f9ffdc1e4746adf108 Mon Sep 17 00:00:00 2001
From: Jason Long <jason@long.name>
Date: Sun, 28 Jul 2013 22:20:49 -0400
Subject: [PATCH] file-format: keep misc sanity checks in place

---
 src/micropolisj/engine/Micropolis.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java
index 4c6635f..4e12b2b 100644
--- a/src/micropolisj/engine/Micropolis.java
+++ b/src/micropolisj/engine/Micropolis.java
@@ -1973,9 +1973,6 @@ public class Micropolis
 		crimeAverage = Integer.parseInt(in.getAttributeValue(null, "crimeAverage"));
 		pollutionAverage = Integer.parseInt(in.getAttributeValue(null, "pollutionAverage"));
 		gameLevel = Integer.parseInt(in.getAttributeValue(null, "gameLevel"));
-		if (!GameLevel.isValid(gameLevel)) {
-			gameLevel = 0;
-		}
 		autoBulldoze = Boolean.parseBoolean(in.getAttributeValue(null, "autoBulldoze"));
 		autoBudget = Boolean.parseBoolean(in.getAttributeValue(null, "autoBudget"));
 		autoGo = Boolean.parseBoolean(in.getAttributeValue(null, "autoGo"));
@@ -1983,6 +1980,10 @@ public class Micropolis
 		simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed"));
 		XML_Helper.skipToEndElement(in);
 
+		if (cityTime < 0) { cityTime = 0; }
+		if (cityTax < 0 || cityTax > 20) { cityTax = 7; }
+		if (gameLevel < 0 || gameLevel > 2) { gameLevel = 0; }
+
 		resCap = false;
 		comCap = false;
 		indCap = false;