Merge pull request #13 from aglab2/master

Added try-catch to support more ROMs with malformed 22 cmds
DavidSM64 · Jul 10, 2018 · 4cfbc19 · 4cfbc19
2 parents 655ecba + 35f1345
commit 4cfbc19
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Scripts/LevelScripts.cs b/src/Scripts/LevelScripts.cs
@@ -470,8 +470,12 @@ private static void CMD_22(ref Level lvl, ref string desc, byte[] cmd)
             lvl.AddObjectCombos(modelID, newModel.GeoDataSegAddress);
             if (rom.getSegment(seg) != null)
             {
-                GeoScripts.resetNodes();
-                GeoScripts.parse(ref newModel, ref lvl, seg, off);
+                try
+                {
+                    GeoScripts.resetNodes();
+                    GeoScripts.parse(ref newModel, ref lvl, seg, off);
+                }
+                catch (Exception) { }
             }
             if (lvl.ModelIDs.ContainsKey(modelID))
                 lvl.ModelIDs.Remove(modelID);