Merge branch 'CnCNet:develop' into develop

Author: CO2-code

ClientCore/INIProcessing/IniPreprocessor.cs

@@ -20,7 +20,7 @@ public void ProcessIni(string sourceIniPath, string destinationIniPath)
             var iniFile = new IniFile(sourceIniPath);
             List<string> sections = iniFile.GetSections();
             sections.ForEach(sectionName => ProcessSection(iniFile, sectionName));
-            iniFile.Comment = $"generated by DTA CnCNet client, see /Base/{Path.GetFileName(sourceIniPath)} for the original";
+            iniFile.Comment = $"generated by CnCNet client, see /Base/{Path.GetFileName(sourceIniPath)} for the original";
 
             iniFile.WriteIniFile(destinationIniPath);
         }

ClientCore/Settings/UserINISettings.cs

@@ -139,6 +139,7 @@ protected UserINISettings(IniFile iniFile)
 
             ScrollRate = new IntSetting(iniFile, OPTIONS, "ScrollRate", 3);
             DragDistance = new IntSetting(iniFile, OPTIONS, "DragDistance", 4);
+            CustomDragDistance = new IntSetting(iniFile, OPTIONS, "CustomDragDistance", 0);
             DoubleTapInterval = new IntSetting(iniFile, OPTIONS, "DoubleTapInterval", 30);
             Win8CompatMode = new StringSetting(iniFile, OPTIONS, "Win8Compat", "No");
 
@@ -239,6 +240,8 @@ protected UserINISettings(IniFile iniFile)
 
         public IntSetting ScrollRate { get; private set; }
         public IntSetting DragDistance { get; private set; }
+        // When > 0, overrides the auto-scaled DragDistance. Allows players to set a fixed pixel threshold regardless of resolution.
+        public IntSetting CustomDragDistance { get; private set; }
         public IntSetting DoubleTapInterval { get; private set; }
         public StringSetting Win8CompatMode { get; private set; }
 

ClientGUI/HotkeyConfigurationWindow.cs

@@ -1,7 +1,12 @@
 ClientUpdater.dll
 ClientUpdater.pdb
+Cyotek.Drawing.BitmapFont.dll
 DiscordRPC.dll
 Facepunch.Steamworks.Win64.dll
+FontStashSharp.Base.dll
+FontStashSharp.Rasterizers.StbTrueTypeSharp.dll
+FontStashSharp.TextShapers.HarfBuzz.dll
+HarfBuzzSharp.dll
 lzo.net.dll
 Microsoft.Extensions.Configuration.Abstractions.dll
 Microsoft.Extensions.Configuration.Binder.dll
@@ -38,6 +43,8 @@ Rampastring.Tools.pdb
 Rampastring.Tools.xml
 SixLabors.ImageSharp.dll
 System.CodeDom.dll
+StbImageSharp.dll
+StbTrueTypeSharp.dll
 steam_api64.dll
 System.Net.Http.Formatting.dll
 TextCopy.dll

CommonAssemblies.txt

@@ -1,7 +1,13 @@
 ClientUpdater.dll
 ClientUpdater.pdb
+Cyotek.Drawing.BitmapFont.dll
 DiscordRPC.dll
 Facepunch.Steamworks.Win64.dll
+FontStashSharp.Base.dll
+FontStashSharp.Rasterizers.StbTrueTypeSharp.dll
+FontStashSharp.TextShapers.HarfBuzz.dll
+HarfBuzzSharp.dll
+libHarfBuzzSharp.dylib
 lzo.net.dll
 Microsoft.Bcl.AsyncInterfaces.dll
 Microsoft.Extensions.Configuration.Abstractions.dll
@@ -38,6 +44,8 @@ Rampastring.Tools.dll
 Rampastring.Tools.pdb
 Rampastring.Tools.xml
 SixLabors.ImageSharp.dll
+StbImageSharp.dll
+StbTrueTypeSharp.dll
 steam_api64.dll
 System.Buffers.dll
 System.CodeDom.dll

CommonAssembliesNetFx.txt

@@ -96,8 +96,8 @@ protected override void Initialize()
 
             try
             {
-                Texture2D texture = new Texture2D(GraphicsDevice, 100, 100, false, SurfaceFormat.Color);
-                Color[] colorArray = new Color[100 * 100];
+                Texture2D texture = new Texture2D(GraphicsDevice, 10, 10, false, SurfaceFormat.Color);
+                Color[] colorArray = new Color[10 * 10];
                 texture.SetData(colorArray);
 
                 _ = AssetLoader.LoadTextureUncached("checkBoxClear.png");

DXMainClient/DXGUI/GameClass.cs

@@ -1136,10 +1136,6 @@ private void ExitClient()
             Logger.Log("Exiting.");
             WindowManager.CloseGame();
             themeSong?.Dispose();
-#if !XNA
-            Thread.Sleep(1000);
-            Environment.Exit(0);
-#endif
         }
 
         public void SwitchOn()

DXMainClient/DXGUI/Generic/MainMenu.cs

@@ -25,6 +25,7 @@ namespace DTAClient.DXGUI.Generic.OptionPanels
 {
     class DisplayOptionsPanel : XNAOptionsPanel
     {
+        // Mouse must move at least this many pixels from click point before drag selection activates.
         private const int DRAG_DISTANCE_DEFAULT = 4;
         private const int ORIGINAL_RESOLUTION_WIDTH = 640;
 
@@ -628,7 +629,10 @@ public override bool Save()
             (IniSettings.IngameScreenWidth.Value, IniSettings.IngameScreenHeight.Value) = ingameRes;
 
             // Calculate drag selection distance, scale it with resolution width
-            int dragDistance = ingameRes.Width / ORIGINAL_RESOLUTION_WIDTH * DRAG_DISTANCE_DEFAULT;
+            // CustomDragDistance > 0 overrides auto-scaling for players who need a specific value
+            int dragDistance = IniSettings.CustomDragDistance.Value > 0
+                ? IniSettings.CustomDragDistance.Value
+                : ingameRes.Width / ORIGINAL_RESOLUTION_WIDTH * DRAG_DISTANCE_DEFAULT;
             IniSettings.DragDistance.Value = dragDistance;
 
             var newSelectedRenderer = (DirectDrawWrapper)ddRenderer.SelectedItem.Tag;

DXMainClient/DXGUI/Generic/OptionPanels/DisplayOptionsPanel.cs

@@ -606,7 +606,7 @@ private void PostUIInit()
 #endif
 
             connectionManager.MainChannel.AddMessage(new ChatMessage(Color.White, Renderer.GetSafeString(
-                    string.Format("*** DTA CnCNet Client version {0} ***".L10N("Client:Main:CnCNetClientVersionMessage"), clientVersion),
+                    string.Format("*** CnCNet Client version {0} ***".L10N("Client:Main:CnCNetClientVersionMessageV2"), clientVersion),
                     lbChatMessages.FontIndex)));
 
             {

DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs

@@ -1119,7 +1119,7 @@ protected void InitPlayerOptionDropdowns()
                 ddPlayerStart.ClientRectangle = new Rectangle(
                     ddPlayerTeam.Right + playerOptionHorizontalMargin,
                     ddPlayerName.Y, startWidth, DROP_DOWN_HEIGHT);
-                for (int j = 1; j < 9; j++)
+                for (int j = 1; j <= MAX_PLAYER_COUNT; j++)
                     ddPlayerStart.AddItem(j.ToString());
                 ddPlayerStart.AllowDropDown = false;
                 ddPlayerStart.SelectedIndexChanged += CopyPlayerDataFromUI;
@@ -2176,6 +2176,9 @@ protected virtual void CopyPlayerDataFromUI(object sender, EventArgs e)
 
             var oldSideId = Players.Find(p => p.Name == ProgramConstants.PLAYERNAME)?.SideId;
 
+            if (Players.Count > MAX_PLAYER_COUNT)
+                throw new Exception($"Player count exceeds maximum of {MAX_PLAYER_COUNT}. How could this happen?");
+
             for (int pId = 0; pId < Players.Count; pId++)
             {
                 PlayerInfo pInfo = Players[pId];
@@ -2281,6 +2284,9 @@ protected virtual void CopyPlayerDataToUI()
             bool allowOptionsChange = AllowPlayerOptionsChange();
             var playerExtraOptions = GetPlayerExtraOptions();
 
+            if (Players.Count > MAX_PLAYER_COUNT)
+                throw new Exception($"Player count exceeds maximum of {MAX_PLAYER_COUNT}. How could this happen?");
+
             // Human players
             for (int pId = 0; pId < Players.Count; pId++)
             {