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

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

@@ -18,6 +18,7 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.GameRules;
namespace OpenRA.Server namespace OpenRA.Server
{ {
@@ -46,25 +47,24 @@ namespace OpenRA.Server
static ModData ModData; static ModData ModData;
static Map Map; static Map Map;
public static void ServerMain(bool internetServer, string masterServerUrl, string name, int port, int extport, public static void ServerMain(ModData modData, UserSettings settings, string map)
string[] mods, string map, bool cheats, ModData modData)
{ {
Log.AddChannel("server", "server.log"); Log.AddChannel("server", "server.log");
isInitialPing = true; isInitialPing = true;
Server.masterServerUrl = masterServerUrl; Server.masterServerUrl = settings.MasterServer;
isInternetServer = internetServer; isInternetServer = settings.AdvertiseOnline;
listener = new TcpListener(IPAddress.Any, port); listener = new TcpListener(IPAddress.Any, settings.ListenPort);
Name = name; Name = settings.LastServerTitle;
ExternalPort = extport; ExternalPort = settings.ExternalPort;
randomSeed = (int)DateTime.Now.ToBinary(); randomSeed = (int)DateTime.Now.ToBinary();
ModData = modData; ModData = modData;
lobbyInfo = new Session(); lobbyInfo = new Session();
lobbyInfo.GlobalSettings.Mods = mods; lobbyInfo.GlobalSettings.Mods = settings.InitialMods;
lobbyInfo.GlobalSettings.RandomSeed = randomSeed; lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
lobbyInfo.GlobalSettings.Map = map; lobbyInfo.GlobalSettings.Map = map;
lobbyInfo.GlobalSettings.AllowCheats = cheats; lobbyInfo.GlobalSettings.AllowCheats = settings.AllowCheats;
LoadMap(); // populates the Session's slots, too. LoadMap(); // populates the Session's slots, too.
@@ -73,8 +73,6 @@ namespace OpenRA.Server
Log.Write("server","- {0}", m); Log.Write("server","- {0}", m);
Log.Write("server", "Initial map: {0}",lobbyInfo.GlobalSettings.Map); Log.Write("server", "Initial map: {0}",lobbyInfo.GlobalSettings.Map);
try try
{ {

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

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