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

remove N params from ServerMain

Browse Source
This commit is contained in:
Chris Forbes
2010-08-23 18:19:36 +12:00
parent fd9a31168d
commit b1b8b2c14a
2 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,8 @@ namespace OpenRA.Widgets.Delegates
{
public CreateServerMenuDelegate()
{
var settings = Game.Settings;
var r = Widget.RootWidget;
var cs = r.GetWidget("CREATESERVER_BG");
r.GetWidget("MAINMENU_BUTTON_CREATE").OnMouseUp = mi => {
@@ -32,38 +34,32 @@ namespace OpenRA.Widgets.Delegates
cs.GetWidget("BUTTON_START").OnMouseUp = mi => {
r.OpenWindow("SERVER_LOBBY");
// TODO: Get this from a map chooser
string map = Game.modData.AvailableMaps.Keys.FirstOrDefault();
var map = Game.modData.AvailableMaps.Keys.FirstOrDefault();
// TODO: Get this from a mod chooser
var mods = Game.LobbyInfo.GlobalSettings.Mods;
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();
settings.LastServerTitle = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text;
settings.ListenPort = int.Parse(cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text);
settings.ExternalPort = int.Parse(cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text);
settings.Save();
Server.Server.ServerMain(Game.Settings.AdvertiseOnline, Game.Settings.MasterServer, Game.Settings.LastServerTitle,
Game.Settings.ListenPort, Game.Settings.ExternalPort, mods, map, Game.Settings.AllowCheats,
Game.modData);
Server.Server.ServerMain(Game.modData, settings, map);
Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
Game.JoinServer(IPAddress.Loopback.ToString(), settings.ListenPort);
return true;
};
cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text = Game.Settings.LastServerTitle;
cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text = Game.Settings.ListenPort.ToString();
cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text = Game.Settings.ExternalPort.ToString();
cs.GetWidget<CheckboxWidget>("CHECKBOX_ONLINE").Checked = () => Game.Settings.AdvertiseOnline;
cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text = settings.LastServerTitle;
cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text = settings.ListenPort.ToString();
cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text = settings.ExternalPort.ToString();
cs.GetWidget<CheckboxWidget>("CHECKBOX_ONLINE").Checked = () => settings.AdvertiseOnline;
cs.GetWidget("CHECKBOX_ONLINE").OnMouseDown = mi => {
Game.Settings.AdvertiseOnline ^= true;
Game.Settings.Save();
settings.AdvertiseOnline ^= true;
settings.Save();
return true;
};
cs.GetWidget<CheckboxWidget>("CHECKBOX_CHEATS").Checked = () => Game.Settings.AllowCheats;
cs.GetWidget<CheckboxWidget>("CHECKBOX_CHEATS").Checked = () => settings.AllowCheats;
cs.GetWidget<CheckboxWidget>("CHECKBOX_CHEATS").OnMouseDown = mi => {
Game.Settings.AllowCheats ^=true;
Game.Settings.Save();
settings.AllowCheats ^=true;
settings.Save();
return true;
};
}