epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the default game name to the player name.

Browse Source
This commit is contained in:
Matthias Mailänder
2021-08-22 11:17:26 +02:00
committed by teinarss
parent 54c08748e0
commit 5bf4daddec
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Server/Server.cs
View File

@@ -222,7 +222,7 @@ namespace OpenRA.Server
Type = type; Type = type;
Settings = settings; Settings = settings;
Settings.Name = OpenRA.Settings.SanitizedServerName(Settings.Name); Settings.Name = Game.Settings.SanitizedServerName(Settings.Name);
ModData = modData; ModData = modData;

6
OpenRA.Game/Settings.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA
public class ServerSettings public class ServerSettings
{ {
[Desc("Sets the server name.")] [Desc("Sets the server name.")]
public string Name = "OpenRA Game"; public string Name = "";
[Desc("Sets the internal port.")] [Desc("Sets the internal port.")]
public int ListenPort = 1234; public int ListenPort = 1234;
@@ -404,11 +404,11 @@ namespace OpenRA
return clean; return clean;
} }
public static string SanitizedServerName(string dirty) public string SanitizedServerName(string dirty)
{ {
var clean = SanitizedName(dirty); var clean = SanitizedName(dirty);
if (string.IsNullOrWhiteSpace(clean)) if (string.IsNullOrWhiteSpace(clean))
return new ServerSettings().Name; return $"{SanitizedPlayerName(Player.Name)}'s Game";
else else
return clean; return clean;
} }

6
OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
View File

@@ -93,11 +93,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
var serverName = panel.Get<TextFieldWidget>("SERVER_NAME"); 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.OnEnterKey = _ => { serverName.YieldKeyboardFocus(); return true; };
serverName.OnLoseFocus = () => serverName.OnLoseFocus = () =>
{ {
serverName.Text = Settings.SanitizedServerName(serverName.Text); serverName.Text = Game.Settings.SanitizedServerName(serverName.Text);
settings.Server.Name = serverName.Text; settings.Server.Name = serverName.Text;
}; };
@@ -184,7 +184,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void CreateAndJoin() 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)) if (!Exts.TryParseIntegerInvariant(panel.Get<TextFieldWidget>("LISTEN_PORT").Text, out var listenPort))
listenPort = 1234; listenPort = 1234;