Added support for hammer++ game configs

#175 #152
ruarai · Aug 19, 2022 · bbf76a5 · bbf76a5
1 parent 11b5487
commit bbf76a5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/CompilePalX/GameConfiguration/GameConfigurationManager.cs b/CompilePalX/GameConfiguration/GameConfigurationManager.cs
@@ -136,10 +136,9 @@ public static void LoadGameConfigurations()
             {
                 string binFolder = (string)rk.GetValue("Directory")!;
 
-                string gameData = Path.Combine(binFolder, "GameConfig.txt");
                 try
                 {
-                    configs.AddRange(GameConfigurationParser.Parse(gameData));
+                    configs.AddRange(GameConfigurationParser.Parse(binFolder));
                 }
                 catch (Exception e)
                 {

diff --git a/CompilePalX/GameConfiguration/GameConfigurationParser.cs b/CompilePalX/GameConfiguration/GameConfigurationParser.cs
@@ -9,34 +9,36 @@
 namespace CompilePalX {
     class GameConfigurationParser
     {
-        public static List<GameConfiguration> Parse(string filename)
+        public static List<GameConfiguration> Parse(string binFolder)
         {
-            var lines = File.ReadAllLines(filename);
+            // prioritize hammer++ configs, fallback to hammer if it doesn't exist
+            string filename = Path.Combine(binFolder, "hammerplusplus", "hammerplusplus_gameconfig.txt");
+            if (!File.Exists(filename))
+                filename = Path.Combine(binFolder, "GameConfig.txt");
+
             var gameInfos = new List<GameConfiguration>();
 
             var data = new KV.FileData(filename);
-
             foreach (KV.DataBlock gamedb in data.headnode.GetFirstByName(new[] { "\"Configs\"", "\"GameConfig.txt\"" })
                          .GetFirstByName("\"Games\"").subBlocks)
             {
-                string binfolder = Path.GetDirectoryName(filename);
                 KV.DataBlock hdb = gamedb.GetFirstByName(new[] { "\"Hammer\"", "\"hammer\"" });
 
                 CompilePalLogger.LogLine($"Gamedb: {gamedb}");
                 GameConfiguration game = new GameConfiguration
                 {
                     Name = gamedb.name.Replace("\"", ""),
-                    BinFolder = binfolder,
-                    GameFolder = GetFullPath(gamedb.TryGetStringValue("GameDir"), binfolder),
-                    GameEXE = GetFullPath(hdb.TryGetStringValue("GameExe"), binfolder),
-                    SDKMapFolder = GetFullPath(hdb.TryGetStringValue("MapDir"), binfolder),
-                    VBSP = GetFullPath(hdb.TryGetStringValue("BSP"), binfolder),
-                    VVIS = GetFullPath(hdb.TryGetStringValue("Vis"), binfolder),
-                    VRAD = GetFullPath(hdb.TryGetStringValue("Light"), binfolder),
-                    MapFolder = GetFullPath(hdb.TryGetStringValue("BSPDir"), binfolder),
-                    BSPZip = Path.Combine(binfolder, "bspzip.exe"),
-                    VBSPInfo = Path.Combine(binfolder, "vbspinfo.exe"),
-                    VPK = Path.Combine(binfolder, "vpk.exe"),
+                    BinFolder = binFolder,
+                    GameFolder = GetFullPath(gamedb.TryGetStringValue("GameDir"), binFolder),
+                    GameEXE = GetFullPath(hdb.TryGetStringValue("GameExe"), binFolder),
+                    SDKMapFolder = GetFullPath(hdb.TryGetStringValue("MapDir"), binFolder),
+                    VBSP = GetFullPath(hdb.TryGetStringValue("BSP"), binFolder),
+                    VVIS = GetFullPath(hdb.TryGetStringValue("Vis"), binFolder),
+                    VRAD = GetFullPath(hdb.TryGetStringValue("Light"), binFolder),
+                    MapFolder = GetFullPath(hdb.TryGetStringValue("BSPDir"), binFolder),
+                    BSPZip = Path.Combine(binFolder, "bspzip.exe"),
+                    VBSPInfo = Path.Combine(binFolder, "vbspinfo.exe"),
+                    VPK = Path.Combine(binFolder, "vpk.exe"),
                 };
 
                 game.SteamAppID = GetSteamAppID(game);