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

Move shroud options to rules.

Browse Source
This commit is contained in:
Paul Chote
2016-02-29 18:43:01 +00:00
parent f44993e4f7
commit 62f28d2909
8 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -432,7 +432,8 @@ namespace OpenRA.Mods.Common.Server
return true;
}
if (server.Map.Options.Shroud.HasValue)
var shroud = server.Map.Rules.Actors["player"].TraitInfo<ShroudInfo>();
if (shroud.ExploredMapLocked)
{
server.SendOrderTo(conn, "Message", "Map has disabled shroud configuration.");
return true;
@@ -455,7 +456,8 @@ namespace OpenRA.Mods.Common.Server
return true;
}
if (server.Map.Options.Fog.HasValue)
var shroud = server.Map.Rules.Actors["player"].TraitInfo<ShroudInfo>();
if (shroud.FogLocked)
{
server.SendOrderTo(conn, "Message", "Map has disabled fog configuration.");
return true;
@@ -1019,6 +1021,11 @@ namespace OpenRA.Mods.Common.Server
var crateSpawner = server.Map.Rules.Actors["world"].TraitInfoOrDefault<CrateSpawnerInfo>();
gs.Crates = crateSpawner != null && crateSpawner.Enabled;
var shroud = server.Map.Rules.Actors["player"].TraitInfo<ShroudInfo>();
gs.Fog = shroud.FogEnabled;
gs.Shroud = !shroud.ExploredMapEnabled;
server.Map.Options.UpdateServerSettings(server.LobbyInfo.GlobalSettings);
}