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

Part 2 of 3: Split Settings into logical units.

Browse Source 
Syntax for command line overrides is now <section>.<setting>=<value>
eg `General.InitialMods=cnc'
This commit is contained in:
Paul Chote
2010-08-23 23:20:27 +12:00
parent 46d0ce89e9
commit 1143f496db
17 changed files with 174 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,19 +53,19 @@ namespace OpenRA.Server
Log.AddChannel("server", "server.log");
isInitialPing = true;
Server.masterServerUrl = settings.MasterServer;
isInternetServer = settings.AdvertiseOnline;
listener = new TcpListener(IPAddress.Any, settings.ListenPort);
Name = settings.LastServerTitle;
ExternalPort = settings.ExternalPort;
Server.masterServerUrl = settings.Server.MasterServer;
isInternetServer = settings.Server.AdvertiseOnline;
listener = new TcpListener(IPAddress.Any, settings.Server.ListenPort);
Name = settings.Server.LastServerTitle;
ExternalPort = settings.Server.ExternalPort;
randomSeed = (int)DateTime.Now.ToBinary();
ModData = modData;
lobbyInfo = new Session();
lobbyInfo.GlobalSettings.Mods = settings.InitialMods;
lobbyInfo.GlobalSettings.Mods = settings.General.InitialMods;
lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
lobbyInfo.GlobalSettings.Map = map;
lobbyInfo.GlobalSettings.AllowCheats = settings.AllowCheats;
lobbyInfo.GlobalSettings.AllowCheats = settings.Server.AllowCheats;
LoadMap(); // populates the Session's slots, too.
@@ -151,7 +151,7 @@ namespace OpenRA.Server
newConn.socket.Send(BitConverter.GetBytes(newConn.PlayerIndex));
conns.Add(newConn);
var defaults = new GameRules.Settings();
var defaults = new GameRules.PlayerSettings();
lobbyInfo.Clients.Add(
new Session.Client()
{