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

Remove LobbyDefaults from mod.yaml.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Manifest.cs
View File

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

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

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

1
OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
View File

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

2
mods/all/mod.yaml
View File

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

2
mods/cnc/mod.yaml
View File

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

2
mods/d2k/mod.yaml
View File

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

2
mods/modchooser/mod.yaml
View File

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

2
mods/ra/mod.yaml
View File

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

2
mods/ts/mod.yaml
View File

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