Fixed bin folder detection for Momentum Mod/Strata

ruarai · Apr 7, 2023 · 0c23d4e · 0c23d4e
1 parent d6c5244
commit 0c23d4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CompilePalX/Compiling/Logger.cs b/CompilePalX/Compiling/Logger.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -97,6 +98,7 @@ public static void LogDebug(string s)
 
         public static void LogLineDebug(string s)
         {
+            Trace.WriteLine(s);
             LogDebug(s + Environment.NewLine);
         }
 

diff --git a/CompilePalX/GameConfiguration/GameConfigurationParser.cs b/CompilePalX/GameConfiguration/GameConfigurationParser.cs
@@ -34,6 +34,12 @@ public static List<GameConfiguration> Parse(string binFolder)
                 var vbspinfo = FindPath("vbspinfo.exe", binFolder, vbspPath);
                 var vpk = FindPath("vpk.exe", binFolder, vbspPath);
 
+                if (Path.GetDirectoryName(bspzip) != binFolder)
+                {
+                    CompilePalLogger.LogLineDebug($"Bin folder \"{binFolder}\" differs from compiler location \"{Path.GetDirectoryName(bspzip)}\"");
+                    binFolder = Path.GetDirectoryName(bspzip);
+                }
+
                 GameConfiguration game = new GameConfiguration
                 {
                     Name = gamedb.name.Replace("\"", ""),