[tiled] r729 - trunk/src/tiled/io/xml

[tiled-svn at biggeruniverse.com]

Author: aturk
Date: 2007-10-23 13:03:09 -0500 (Tue, 23 Oct 2007)
New Revision: 729

Modified:
   trunk/src/tiled/io/xml/XMLMapTransformer.java
Log:
Slight mod to XMLMapTransformer so that TMX files are not required to have tilesets specified before layers (though it would be nice if they were).

Modified: trunk/src/tiled/io/xml/XMLMapTransformer.java
===================================================================
--- trunk/src/tiled/io/xml/XMLMapTransformer.java	2007-04-06 16:21:54 UTC (rev 728)
+++ trunk/src/tiled/io/xml/XMLMapTransformer.java	2007-10-23 18:03:09 UTC (rev 729)
@@ -683,16 +683,20 @@
             setOrientation("orthogonal");
         }
 
+        // Load properties
         readProperties(mapNode.getChildNodes(), map.getProperties());
 
-        // Load the tilesets, properties, layers and objectgroups
+        // Load tilesets first, in case order is munged
+        NodeList l = doc.getElementsByTagName("tileset");
+            for (int i = 0; (item = l.item(i)) != null; i++) {
+                    map.addTileset(unmarshalTileset(item));
+        }
+
+        // Load the layers and objectgroups
         for (Node sibs = mapNode.getFirstChild(); sibs != null;
                 sibs = sibs.getNextSibling())
         {
-            if ("tileset".equals(sibs.getNodeName())) {
-                map.addTileset(unmarshalTileset(sibs));
-            }
-            else if ("layer".equals(sibs.getNodeName())) {
+            if ("layer".equals(sibs.getNodeName())) {
                 MapLayer layer = readLayer(sibs);
                 if (layer != null) {
                     map.addLayer(layer);