Remove LobbyDefaults from mod.yaml.

This commit is contained in:
Paul Chote
2016-02-29 23:17:21 +00:00
parent d4f8fe1666
commit 8017844a15
9 changed files with 0 additions and 22 deletions

View File

@@ -44,7 +44,6 @@ namespace OpenRA
public readonly IReadOnlyDictionary<string, string> Packages;
public readonly IReadOnlyDictionary<string, string> MapFolders;
public readonly MiniYaml LoadScreen;
public readonly MiniYaml LobbyDefaults;
public readonly Dictionary<string, string> RequiresMods;
public readonly Dictionary<string, Pair<string, int>> Fonts;
@@ -98,9 +97,6 @@ namespace OpenRA
if (!yaml.TryGetValue("LoadScreen", out LoadScreen))
throw new InvalidDataException("`LoadScreen` section is not defined.");
if (!yaml.TryGetValue("LobbyDefaults", out LobbyDefaults))
throw new InvalidDataException("`LobbyDefaults` section is not defined.");
Fonts = yaml["Fonts"].ToDictionary(my =>
{
var nd = my.ToDictionary();

View File

@@ -154,8 +154,6 @@ namespace OpenRA.Server
}
};
FieldLoader.Load(LobbyInfo.GlobalSettings, modData.Manifest.LobbyDefaults);
new Thread(_ =>
{
foreach (var t in serverTraits.WithInterface<INotifyServerStart>())
@@ -608,10 +606,7 @@ namespace OpenRA.Server
DispatchOrders(toDrop, frame, new byte[] { 0xbf });
if (!Conns.Any())
{
FieldLoader.Load(LobbyInfo.GlobalSettings, ModData.Manifest.LobbyDefaults);
TempBans.Clear();
}
if (Conns.Any() || LobbyInfo.GlobalSettings.Dedicated)
SyncLobbyClients();

View File

@@ -24,7 +24,6 @@ namespace OpenRA.Mods.Common.Server
return;
var defaults = new Session.Global();
FieldLoader.Load(defaults, Game.ModData.Manifest.LobbyDefaults);
if (server.LobbyInfo.GlobalSettings.AllowCheats != defaults.AllowCheats)
server.SendOrderTo(conn, "Message", "Allow Cheats: {0}".F(server.LobbyInfo.GlobalSettings.AllowCheats));

View File

@@ -31,8 +31,6 @@ ChromeMetrics:
Fonts:
LobbyDefaults:
SoundFormats:
SpriteFormats:

View File

@@ -162,8 +162,6 @@ ServerTraits:
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
ChromeMetrics:
common|metrics.yaml
cnc|metrics.yaml

View File

@@ -155,8 +155,6 @@ ServerTraits:
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
ChromeMetrics:
common|metrics.yaml
d2k|metrics.yaml

View File

@@ -53,8 +53,6 @@ Fonts:
Font: common|FreeSansBold.ttf
Size:10
LobbyDefaults:
SoundFormats:
SpriteFormats: ShpTD

View File

@@ -165,8 +165,6 @@ ServerTraits:
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
ChromeMetrics:
common|metrics.yaml
ra|metrics.yaml

View File

@@ -214,8 +214,6 @@ ServerTraits:
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
ChromeMetrics:
common|metrics.yaml
ts|metrics.yaml