From a54d0fd6e8931be4a01c4e06fdd69c7f476b81f4 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Tue, 23 Jul 2013 13:45:02 +0200
Subject: [PATCH] Bugfix: Load all icons for monsters spawned on maps, even
 when they're not part of the list of monsters that may spawn on maps

---
 .../rpg/AndorsTrail/resource/tiles/TileManager.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
index f05af50b4..415a73535 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
@@ -104,10 +104,16 @@ public final class TileManager {
 	
 	public HashSet<Integer> getTileIDsFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world) {
 		HashSet<Integer> iconIDs = new HashSet<Integer>();
-		for(MonsterSpawnArea a : map.spawnAreas) {
-			for(String monsterTypeID : a.monsterTypeIDs) {
+		for (MonsterSpawnArea a : map.spawnAreas) {
+			for (String monsterTypeID : a.monsterTypeIDs) {
 				iconIDs.add(world.monsterTypes.getMonsterType(monsterTypeID).iconID);
 			}
+			// Add icons for monsters that are already spawned, but that do not belong to the group of
+			// monsters that usually spawn here. This could happen if we change the contents of spawn-
+			// areas in a later release,
+			for (Monster m : a.monsters) {
+				iconIDs.add(m.iconID);
+			}
 		}
 		iconIDs.addAll(tileMap.usedTileIDs);
 		return iconIDs;