Merge branch 'master' into fix-inventory-drag-item

ethanmoffat · Sep 28, 2022 · 3c7d3c9 · 3c7d3c9
2 parents b2ca533 + b21ab37
commit 3c7d3c9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/EndlessClient/ControlSets/InitialControlSet.cs b/EndlessClient/ControlSets/InitialControlSet.cs
@@ -134,7 +134,7 @@ private IXNAButton MainButtonCreationHelper(GameControlIdentifier whichControl)
             var outSource = new Rectangle(0, i * heightFactor, widthFactor, heightFactor);
             var overSource = new Rectangle(widthFactor, i * heightFactor, widthFactor, heightFactor);
 
-            return new XNAButton(_mainButtonTexture, new Vector2(26, 278 + i * 40), outSource, overSource);
+            return new XNAButton(_mainButtonTexture, new Vector2(25, 280 + i * 40), outSource, overSource);
         }
 
         private IXNALabel GetVersionInfoLabel()
@@ -148,8 +148,8 @@ private IXNALabel GetVersionInfoLabel()
                                      _configProvider.VersionBuild,
                                      _configProvider.Host,
                                      _configProvider.Port),
-                ForeColor = Color.Black,
-                DrawArea = new Rectangle(20, 459, 1, 1)
+                ForeColor = Color.FromNonPremultiplied(190, 170, 150, 255),
+                DrawArea = new Rectangle(28, 457, 1, 1)
             };
         }
 

diff --git a/EndlessClient/Dialogs/EOMessageBox.cs b/EndlessClient/Dialogs/EOMessageBox.cs
@@ -48,9 +48,11 @@ public EOMessageBox(INativeGraphicsManager graphicsManager,
                 AutoSize = true,
                 ForeColor = ColorConstants.LightYellowText,
                 Text = message,
-                TextWidth = 254,
-                DrawPosition = new Vector2(18, useSmallHeader ? 40 : 57)
+                TextWidth = 240,
+                DrawPosition = new Vector2(21, useSmallHeader ? 40 : 62),
+                WrapBehavior = WrapBehavior.WrapToNewLine,
             };
+
             _messageLabel.SetParentControl(this);
 
             _captionLabel = new XNALabel(Constants.FontSize10)
@@ -59,7 +61,7 @@ public EOMessageBox(INativeGraphicsManager graphicsManager,
                 ForeColor = ColorConstants.LightYellowText,
                 Text = caption,
                 TextWidth = 254,
-                DrawPosition = useSmallHeader ? new Vector2(18, 12) : new Vector2(59, 23)
+                DrawPosition = useSmallHeader ? new Vector2(18, 12) : new Vector2(60, 27)
             };
             _captionLabel.SetParentControl(this);
 

diff --git a/EndlessClient/GameExecution/GameRunnerBase.cs b/EndlessClient/GameExecution/GameRunnerBase.cs
@@ -6,6 +6,7 @@
 using EOLib.Graphics;
 using EOLib.Localization;
 using System;
+using System.Net;
 
 #if !LINUX
 using System.Windows.Forms;
@@ -71,8 +72,14 @@ public virtual bool SetupDependencies()
                 if (string.Equals(arg, "--host") && i < _args.Length - 1)
                 {
                     var host = _args[i + 1];
-                    _registry.Resolve<IConfigurationRepository>()
-                        .Host = host;
+
+                    if (IPEndPoint.TryParse(host, out var endpoint)) {
+                        _registry.Resolve<IConfigurationRepository>()
+                            .Host = endpoint.Address.ToString();
+
+                        _registry.Resolve<IConfigurationRepository>()
+                            .Port = endpoint.Port;
+                    }
 
                     i++;
                 }