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

Persist server settings

Browse Source
This commit is contained in:
Paul Chote
2010-07-11 12:23:24 +12:00
parent 96c80f357c
commit 424aa5c2d2
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/GameRules/UserSettings.cs
View File

@@ -54,9 +54,10 @@ namespace OpenRA.GameRules
public string[] InitialMods = { "ra" }; public string[] InitialMods = { "ra" };
// Server settings // Server settings
public string LastServerTitle = "OpenRA Game";
public int ListenPort = 1234; public int ListenPort = 1234;
public int ExternalPort = 1234; public int ExternalPort = 1234;
public bool InternetServer = true; public bool AdvertiseOnline = true;
public string MasterServer = "http://open-ra.org/master/"; public string MasterServer = "http://open-ra.org/master/";
string SettingsFile; string SettingsFile;

19
OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
View File

@@ -41,7 +41,6 @@ namespace OpenRA.Widgets.Delegates
cs.GetWidget("BUTTON_START").OnMouseUp = mi => { cs.GetWidget("BUTTON_START").OnMouseUp = mi => {
r.OpenWindow("SERVER_LOBBY"); r.OpenWindow("SERVER_LOBBY");
Log.Write("debug", "Creating server");
// TODO: Get this from a map chooser // TODO: Get this from a map chooser
string map = Game.AvailableMaps.Keys.FirstOrDefault(); string map = Game.AvailableMaps.Keys.FirstOrDefault();
@@ -49,24 +48,24 @@ namespace OpenRA.Widgets.Delegates
// TODO: Get this from a mod chooser // TODO: Get this from a mod chooser
var mods = Game.Settings.InitialMods; var mods = Game.Settings.InitialMods;
var gameName = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text; Game.Settings.LastServerTitle = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text;
Game.Settings.ListenPort = int.Parse(cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text);
Game.Settings.ExternalPort = int.Parse(cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text);
Game.Settings.Save();
int listenPort = int.Parse(cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text); Server.Server.ServerMain(Game.Settings.AdvertiseOnline, Game.Settings.MasterServer, Game.Settings.LastServerTitle,
int extPort = int.Parse(cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text); Game.Settings.ListenPort, Game.Settings.ExternalPort, mods, map);
Server.Server.ServerMain(Game.Settings.InternetServer, Game.Settings.MasterServer,
gameName, listenPort, extPort, mods, map);
Log.Write("debug", "Joining server");
Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort); Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
return true; return true;
}; };
cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text = Game.Settings.LastServerTitle;
cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text = Game.Settings.ListenPort.ToString(); cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text = Game.Settings.ListenPort.ToString();
cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text = Game.Settings.ExternalPort.ToString(); cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text = Game.Settings.ExternalPort.ToString();
cs.GetWidget<CheckboxWidget>("CHECKBOX_ONLINE").Checked = () => Game.Settings.InternetServer; cs.GetWidget<CheckboxWidget>("CHECKBOX_ONLINE").Checked = () => Game.Settings.AdvertiseOnline;
cs.GetWidget("CHECKBOX_ONLINE").OnMouseDown = mi => { cs.GetWidget("CHECKBOX_ONLINE").OnMouseDown = mi => {
Game.Settings.InternetServer ^= true; Game.Settings.AdvertiseOnline ^= true;
Game.Settings.Save(); Game.Settings.Save();
return true; return true;
}; };