diff --git a/org/lateralgm/file/GmFileReader.java b/org/lateralgm/file/GmFileReader.java index 040e1f258..921bd0338 100644 --- a/org/lateralgm/file/GmFileReader.java +++ b/org/lateralgm/file/GmFileReader.java @@ -1260,12 +1260,10 @@ private static void readTree(ProjectFileContext c, ResNode root, int ver) throws type = Include.class; int ind = in.read4(); String name = in.readStr(); - boolean hasRef; + boolean hasRef = false; if (status == ResNode.STATUS_SECONDARY) hasRef = type == Font.class ? ver != 500 : (type == null ? false : InstantiableResource.class.isAssignableFrom(type)); - else - hasRef = false; ResourceList rl = hasRef ? (ResourceList) f.resMap.get(type) : null; ResNode node = new ResNode(name,status,type,hasRef ? rl.getUnsafe(ind).reference : null); if (ver == 500 && type == Include.class) @@ -1276,15 +1274,15 @@ private static void readTree(ProjectFileContext c, ResNode root, int ver) throws // GameMaker 5 did not have a dedicated primary fonts group, let's add one. if (status == ResNode.STATUS_PRIMARY) - path.peek().addChild(ProjectFile.interfaceProvider.translate("LGM.FNT"), - status,Font.class); //$NON-NLS-1$ + path.peek().addChild(ProjectFile.interfaceProvider.translate("LGM.FNT"), //$NON-NLS-1$ + status,Font.class); } path.peek().add(node); int contents = in.read4(); if (contents > 0) { - left.push(new Integer(rootnodes)); + left.push(Integer.valueOf(rootnodes)); rootnodes = contents; path.push(node); } diff --git a/org/lateralgm/main/LGM.java b/org/lateralgm/main/LGM.java index 15bdcb767..70604c693 100644 --- a/org/lateralgm/main/LGM.java +++ b/org/lateralgm/main/LGM.java @@ -132,7 +132,7 @@ public final class LGM { - public static final String version = "1.8.179"; //$NON-NLS-1$ + public static final String version = "1.8.180"; //$NON-NLS-1$ // TODO: This list holds the class loader for any loaded plugins which should be // cleaned up and closed when the application closes.