fix improper cmd int version parsing, allow specifying mappings in cm…

…d when opening file
atenfyr · Jan 19, 2025 · 37d58e6 · 37d58e6
1 parent 79c0df7
commit 37d58e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/UAssetGUI/Form1.cs b/UAssetGUI/Form1.cs
@@ -387,10 +387,17 @@ private void Form1_Load(object sender, EventArgs e)
             if (args.Length > 1)
             {
                 EngineVersion selectedVer = EngineVersion.UNKNOWN;
-                if (args.Length > 2 && !Enum.TryParse(args[2], out selectedVer))
+
+                if (args.Length > 2)
+                {
+                    if (int.TryParse(args[2], out int selectedVerRaw)) selectedVer = EngineVersion.VER_UE4_0 + selectedVerRaw;
+                    else Enum.TryParse(args[2], out selectedVer);
+                }
+                if (args.Length > 3)
                 {
-                    if (int.TryParse(args[2], out int selectedVerRaw)) selectedVer = (EngineVersion)selectedVerRaw;
+                    UpdateMappings(args[3]);
                 }
+
                 if (selectedVer > EngineVersion.UNKNOWN) SetParsingVersion(selectedVer);
                 LoadFileAt(args[1]);
             }

diff --git a/UAssetGUI/Program.cs b/UAssetGUI/Program.cs
@@ -33,18 +33,16 @@ static void Main()
                 switch (args[1].ToLowerInvariant())
                 {
                     // tojson <source> <destination> <engine version> [mappings name]
-                    // UAssetGUI tojson A.umap B.json 514 Outriders
+                    // UAssetGUI tojson A.umap B.json 23 Outriders
                     case "tojson":
                         UAGConfig.LoadMappings();
 
                         if (args.Length < 5) break;
                         if (args.Length >= 6) UAGConfig.TryGetMappings(args[5], out selectedMappings);
 
                         EngineVersion selectedVer = EngineVersion.UNKNOWN;
-                        if (!Enum.TryParse(args[4], out selectedVer))
-                        {
-                            if (int.TryParse(args[4], out int selectedVerRaw)) selectedVer = EngineVersion.VER_UE4_0 + selectedVerRaw;
-                        }
+                        if (int.TryParse(args[4], out int selectedVerRaw)) selectedVer = EngineVersion.VER_UE4_0 + selectedVerRaw;
+                        else Enum.TryParse(args[4], out selectedVer);
 
                         string jsonSerializedAsset = new UAsset(args[2], selectedVer, selectedMappings).SerializeJson(Newtonsoft.Json.Formatting.Indented);
                         File.WriteAllText(args[3], jsonSerializedAsset);