Move crates option to rules.

This commit is contained in:
Paul Chote
2016-02-29 18:21:21 +00:00
parent aed8518e04
commit f44993e4f7
9 changed files with 21 additions and 13 deletions

View File

@@ -519,7 +519,8 @@ namespace OpenRA.Mods.Common.Server
return true;
}
if (server.Map.Options.Crates.HasValue)
var crateSpawner = server.Map.Rules.Actors["world"].TraitInfoOrDefault<CrateSpawnerInfo>();
if (crateSpawner == null || crateSpawner.Locked)
{
server.SendOrderTo(conn, "Message", "Map has disabled crate configuration.");
return true;
@@ -1015,6 +1016,9 @@ namespace OpenRA.Mods.Common.Server
var gs = server.LobbyInfo.GlobalSettings;
var devMode = server.Map.Rules.Actors["player"].TraitInfo<DeveloperModeInfo>();
gs.AllowCheats = devMode.Enabled;
var crateSpawner = server.Map.Rules.Actors["world"].TraitInfoOrDefault<CrateSpawnerInfo>();
gs.Crates = crateSpawner != null && crateSpawner.Enabled;
server.Map.Options.UpdateServerSettings(server.LobbyInfo.GlobalSettings);
}