Editor: fix writing invalid config

Fix case when writing GraphicsDriver config in acsetup.cfg, check if it's D3D9 and use OpenGL instead.
adventuregamestudio · Dec 12, 2023 · eecba1f · eecba1f
1 parent aa368fc
commit eecba1f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/Editor/AGS.Editor/AGSEditor.cs b/Editor/AGS.Editor/AGSEditor.cs
@@ -1440,13 +1440,11 @@ private static string MakeGameScalingConfig(GameScaling scaling)
         /// <summary>
         /// Writes the config file using particular game Settings and DefaultSetup options.
         /// </summary>
-		public void WriteConfigFile(string configFilePath, bool resetFile = true)
+		public void WriteConfigFile(string configFilePath, RuntimeSetup setup, bool resetFile = true)
 		{
             if (resetFile)
                 Utilities.TryDeleteFile(configFilePath);
 
-            RuntimeSetup setup = _game.DefaultSetup;
-
             var sections = new Dictionary<string, Dictionary<string, string>>();
             sections.Add("graphics", new Dictionary<string, string>());
             sections.Add("language", new Dictionary<string, string>());

diff --git a/Editor/AGS.Editor/BuildTargets/BuildTargetBase.cs b/Editor/AGS.Editor/BuildTargets/BuildTargetBase.cs
@@ -43,6 +43,11 @@ public virtual string GetCompiledPath(params string[] parts)
             return sb.ToString();
         }
 
+        public virtual RuntimeSetup FixInvalidSettings(RuntimeSetup setup)
+        {
+            return setup;
+        }
+
         public virtual string[] GetRequiredLibraryNames()
         {
             return new List<string>(GetRequiredLibraryPaths().Keys).ToArray();
@@ -148,7 +153,11 @@ protected void GenerateConfigFile(string destDir)
                 }
                 catch (Exception) { }
             }
-            AGSEditor.Instance.WriteConfigFile(destPath, false);
+
+            RuntimeSetup setup = Factory.AGSEditor.CurrentGame.DefaultSetup;
+            setup = FixInvalidSettings(setup.Clone());
+
+            AGSEditor.Instance.WriteConfigFile(destPath, setup, false);
         }
 
         /// <summary>

diff --git a/Editor/AGS.Editor/BuildTargets/BuildTargetLinux.cs b/Editor/AGS.Editor/BuildTargets/BuildTargetLinux.cs
@@ -212,5 +212,12 @@ public override string OutputDirectory
                 return LINUX_DIR;
             }
         }
+
+        public override RuntimeSetup FixInvalidSettings(RuntimeSetup setup)
+        {
+            setup.GraphicsDriver = setup.GraphicsDriver == GraphicsDriver.D3D9 ? GraphicsDriver.OpenGL : setup.GraphicsDriver;
+
+            return setup;
+        }
     }
 }
diff --git a/Editor/AGS.Editor/BuildTargets/BuildTargetWeb.cs b/Editor/AGS.Editor/BuildTargets/BuildTargetWeb.cs
@@ -105,5 +105,12 @@ public override string OutputDirectory
                 return WEB_DIR;
             }
         }
+
+        public override RuntimeSetup FixInvalidSettings(RuntimeSetup setup)
+        {
+            setup.GraphicsDriver = setup.GraphicsDriver == GraphicsDriver.D3D9 ? GraphicsDriver.OpenGL : setup.GraphicsDriver;
+
+            return setup;
+        }
     }
 }