Set the default game name to the player name.

OpenRA · Sep 15, 2021 · 5bf4dad · 5bf4dad
1 parent 54c0874
commit 5bf4dad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
@@ -222,7 +222,7 @@ public Server(List<IPEndPoint> endpoints, ServerSettings settings, ModData modDa
 			Type = type;
 			Settings = settings;
 
-			Settings.Name = OpenRA.Settings.SanitizedServerName(Settings.Name);
+			Settings.Name = Game.Settings.SanitizedServerName(Settings.Name);
 
 			ModData = modData;
 

diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs
@@ -45,7 +45,7 @@ public enum WorldViewport { Native, Close, Medium, Far }
 	public class ServerSettings
 	{
 		[Desc("Sets the server name.")]
-		public string Name = "OpenRA Game";
+		public string Name = "";
 
 		[Desc("Sets the internal port.")]
 		public int ListenPort = 1234;
@@ -404,11 +404,11 @@ static string SanitizedName(string dirty)
 			return clean;
 		}
 
-		public static string SanitizedServerName(string dirty)
+		public string SanitizedServerName(string dirty)
 		{
 			var clean = SanitizedName(dirty);
 			if (string.IsNullOrWhiteSpace(clean))
-				return new ServerSettings().Name;
+				return $"{SanitizedPlayerName(Player.Name)}'s Game";
 			else
 				return clean;
 		}

diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
@@ -93,11 +93,11 @@ public ServerCreationLogic(Widget widget, ModData modData, Action onExit, Action
 			}
 
 			var serverName = panel.Get<TextFieldWidget>("SERVER_NAME");
-			serverName.Text = Settings.SanitizedServerName(settings.Server.Name);
+			serverName.Text = Game.Settings.SanitizedServerName(settings.Server.Name);
 			serverName.OnEnterKey = _ => { serverName.YieldKeyboardFocus(); return true; };
 			serverName.OnLoseFocus = () =>
 			{
-				serverName.Text = Settings.SanitizedServerName(serverName.Text);
+				serverName.Text = Game.Settings.SanitizedServerName(serverName.Text);
 				settings.Server.Name = serverName.Text;
 			};
 
@@ -184,7 +184,7 @@ void BuildNotices()
 
 		void CreateAndJoin()
 		{
-			var name = Settings.SanitizedServerName(panel.Get<TextFieldWidget>("SERVER_NAME").Text);
+			var name = Game.Settings.SanitizedServerName(panel.Get<TextFieldWidget>("SERVER_NAME").Text);
 			if (!Exts.TryParseIntegerInvariant(panel.Get<TextFieldWidget>("LISTEN_PORT").Text, out var listenPort))
 				listenPort = 1234;