Browse code

Merge branch 'master' of bci.im:/srv/git/libtiled-jpurexml

devnewton authored on 15/02/2014 at 12:54:03
Showing 3 changed files
... ...
@@ -38,7 +38,6 @@ THE SOFTWARE. -->
38 38
         <connection>scm:git:git@github.com:devnewton/libtiled-jpurexml.git</connection>
39 39
         <developerConnection>scm:git:git@github.com:devnewton/libtiled-jpurexml.git</developerConnection>
40 40
         <url>git@github.com:devnewton/libtiled-jpurexml.git</url>
41
-      <tag>HEAD</tag>
42 41
   </scm>
43 42
     <licenses>
44 43
         <license>
... ...
@@ -122,7 +121,7 @@ THE SOFTWARE. -->
122 122
                     <localCheckout>true</localCheckout>
123 123
                 </configuration>
124 124
             </plugin> 
125
-	 </plugins>
125
+        </plugins>
126 126
     </build>
127 127
     <profiles>
128 128
         <profile>
... ...
@@ -23,8 +23,6 @@
23 23
  */
24 24
 package im.bci.tmxloader;
25 25
 
26
-import java.util.Scanner;
27
-
28 26
 /**
29 27
  *
30 28
  * @author devnewton
... ...
@@ -87,6 +87,7 @@ public class TmxLoader {
87 87
                                     tileInstancePool.put(instance, instance);
88 88
                                 }
89 89
                                 layer.setTileAt(x, y, instance);
90
+                                break;
90 91
                             }
91 92
                         }
92 93
                     }
... ...
@@ -145,8 +146,8 @@ public class TmxLoader {
145 145
             if ("tileset".equals(child.name)) {
146 146
                 TmxTileset tileset = new TmxTileset();
147 147
                 String source = child.attributes.get("source");
148
+                tileset.setFirstgid(getMandatoryIntAttribute(child, "firstgid"));
148 149
                 if (null != source) {
149
-                    tileset.setFirstgid(getMandatoryIntAttribute(child, "firstgid"));
150 150
                     tileset.setSource(source);
151 151
                 } else {
152 152
                     parseTileset(child, map, tileset);