Merge pull request #12 from General-101/master

Launcher fixes
num0005 · Oct 22, 2021 · 4ee2c2e · 4ee2c2e
2 parents ea9e324 + c6ea3f2
commit 4ee2c2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Launcher/MainWindow.xaml.cs b/Launcher/MainWindow.xaml.cs
@@ -717,7 +717,7 @@ private async void CompileLevel(string level_path, string bsp_path, string Level
                 var info = ToolkitBase.SplitStructureFilename(level_path, bsp_path);
                 var scen_path = Path.Combine(info.ScenarioPath, info.ScenarioName);
                 CancelableProgressBarWindow<int> progress = null;
-                if (halo_3 || (halo_2_mcc && lightmaps_args.instanceCount > 1))
+                if (halo_3 || ((halo_2_mcc || halo_2_standalone_community) && lightmaps_args.instanceCount > 1))
                     progress = new CancelableProgressBarWindow<int>();
                 try
                 {

diff --git a/Launcher/ToolkitInterface/H2Toolkit.cs b/Launcher/ToolkitInterface/H2Toolkit.cs
@@ -4,6 +4,7 @@
 using static ToolkitLauncher.ToolkitProfiles;
 using System.IO;
 using System.Threading;
+using System.Diagnostics;
 
 namespace ToolkitLauncher.ToolkitInterface
 {
@@ -59,7 +60,7 @@ public override async Task BuildLightmap(string scenario, string bsp, LightmapAr
         {
             string quality = GetLightmapQuality(args);
 
-            if (args.instanceCount > 1 && Profile.IsMCC || Profile.CommunityTools)
+            if (args.instanceCount > 1 && (Profile.IsMCC || Profile.CommunityTools)) // multi instance?
             {
                 if (progress is not null)
                     progress.MaxValue += 1 + args.instanceCount;
@@ -105,12 +106,13 @@ async Task RunInstance(int index)
             }
             else
             {
+                Debug.Assert(args.instanceCount == 1); // should be one, otherwise we got bad args
                 if (progress is not null)
                 {
                     progress.DisableCancellation();
                     progress.MaxValue += 1;
                 }
-                await RunTool(ToolType.Tool, new() { "lightmaps", scenario, bsp, quality });
+                await RunTool((args.NoAssert && Profile.IsMCC) ? ToolType.ToolFast : ToolType.Tool, new() { "lightmaps", scenario, bsp, quality });
                 if (progress is not null)
                     progress.Report(1);
             }

diff --git a/Launcher/ToolkitInterface/H3Toolkit.cs b/Launcher/ToolkitInterface/H3Toolkit.cs
@@ -55,9 +55,9 @@ private static string GetLightmapQuality(LightmapArgs lightmapArgs)
             return lightmapArgs.level_combobox.ToLower();
         }
 
-        public async Task FauxSync(string scenario, string bsp, bool instanceOutput)
+        public async Task FauxSync(string scenario, string bsp, bool instanceOutput, bool useFast)
         {
-            await RunTool(ToolType.Tool, new() { "faux_data_sync", scenario, bsp }, instanceOutput);
+            await RunTool(useFast ? ToolType.ToolFast : ToolType.Tool, new() { "faux_data_sync", scenario, bsp }, instanceOutput);
         }
 
         private static int FauxCalculateJobID(string scenario, string bsp)
@@ -83,7 +83,7 @@ public async Task FauxLocalFarm(string scenario, string bsp, string lightmapGrou
 
             // first sync
             progress.Status = "Syncing faux (this might take a while)...";
-            await FauxSync(scenario, bsp, instanceOutput);
+            await FauxSync(scenario, bsp, instanceOutput, useFast);
             progress.Report(1);
 
             int jobID = FauxCalculateJobID(scenario, bsp);