From 9405ad323a109ac8d29da0bb32a9378a0f0cbfc0 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 3 Nov 2013 12:40:13 +0100
Subject: [PATCH] Bugfix: do not hardcode map names when upgrading savegame

---
 .../savegames/LegacySavegameFormatReaderForPlayer.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
index 52289ebf8..1520e341f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
@@ -114,9 +114,9 @@ public final class LegacySavegameFormatReaderForPlayer {
 	}
 
 	private static void deactivateSpawnArea(WorldContext world, ControllerContext controllers, String mapName, String monsterTypeSpawnGroup) {
-		PredefinedMap map = world.maps.findPredefinedMap("fallhaven_prison");
+		PredefinedMap map = world.maps.findPredefinedMap(mapName);
 		for (MonsterSpawnArea area : map.spawnAreas) {
-			if (!area.monsterTypeSpawnGroup.equals("fallhaven_prisoner")) continue;
+			if (!area.monsterTypeSpawnGroup.equals(monsterTypeSpawnGroup)) continue;
 			controllers.monsterSpawnController.deactivateSpawnArea(area, true);
 		}
 	}