Bugfix: only parse maps on worldmap that are actually present as maps.

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
index 16513d2915e5d3c94b4885163c43fb9efe5707cb..18f30468b1e02768ad03a56f10c85caf51051568 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
@@ -40,7 +40,7 @@ public final class WorldMapParser {
                }
        }
 
-       private static WorldMapSegment parseSegment(XmlResourceParser xrp, MapCollection maps) throws XmlPullParserException, IOException {
+       private static WorldMapSegment parseSegment(XmlResourceParser xrp, final MapCollection maps) throws XmlPullParserException, IOException {
                String segmentName = xrp.getAttributeValue(null, "id");
                final WorldMapSegment segment = new WorldMapSegment(segmentName);
                
@@ -50,6 +50,7 @@ public final class WorldMapParser {
                        public void handleTag(XmlResourceParser xrp, String tagName) throws XmlPullParserException, IOException {
                                if (tagName.equals("map")) {
                                        String mapName = xrp.getAttributeValue(null, "id");
+                                       if (maps.findPredefinedMap(mapName) == null) return;
                                        Coord mapPosition = new Coord(
                                                        xrp.getAttributeIntValue(null, "x", -1),
                                                        xrp.getAttributeIntValue(null, "y", -1)