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

Changes shroud lobby setting from disabling shroud to revealing it.

Browse Source
This commit is contained in:
deniz1a
2015-07-26 03:25:43 +03:00
parent 582c93dda5
commit 7efbf0633e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/World/Shroud.cs
View File

@@ -282,7 +282,7 @@ namespace OpenRA.Traits
return explored.Contains(uv) && explored[uv] && (generatedShroudCount[uv] == 0 || visibleCount[uv] > 0); return explored.Contains(uv) && explored[uv] && (generatedShroudCount[uv] == 0 || visibleCount[uv] > 0);
} }
public bool ShroudEnabled { get { return !Disabled && self.World.LobbyInfo.GlobalSettings.Shroud; } } public bool ShroudEnabled { get { return !Disabled; } }
/// <summary> /// <summary>
/// Returns a fast exploration lookup that skips the usual validation. /// Returns a fast exploration lookup that skips the usual validation.

4
OpenRA.Game/World.cs
View File

@@ -180,6 +180,10 @@ namespace OpenRA
MapUid = Map.Uid, MapUid = Map.Uid,
MapTitle = Map.Title MapTitle = Map.Title
}; };
if (!LobbyInfo.GlobalSettings.Shroud)
foreach (var player in Players)
player.Shroud.ExploreAll(this);
} }
public void LoadComplete(WorldRenderer wr) public void LoadComplete(WorldRenderer wr)

4
OpenRA.Mods.Common/Traits/RevealsShroud.cs
View File

@@ -30,7 +30,6 @@ namespace OpenRA.Mods.Common.Traits
static readonly PPos[] NoCells = { }; static readonly PPos[] NoCells = { };
readonly RevealsShroudInfo info; readonly RevealsShroudInfo info;
readonly bool lobbyShroudFogDisabled;
[Sync] CPos cachedLocation; [Sync] CPos cachedLocation;
[Sync] bool cachedDisabled; [Sync] bool cachedDisabled;
@@ -41,7 +40,6 @@ namespace OpenRA.Mods.Common.Traits
public RevealsShroud(Actor self, RevealsShroudInfo info) public RevealsShroud(Actor self, RevealsShroudInfo info)
{ {
this.info = info; this.info = info;
lobbyShroudFogDisabled = !self.World.LobbyInfo.GlobalSettings.Shroud && !self.World.LobbyInfo.GlobalSettings.Fog;
addCellsToPlayerShroud = (p, uv) => p.Shroud.AddProjectedVisibility(self, uv); addCellsToPlayerShroud = (p, uv) => p.Shroud.AddProjectedVisibility(self, uv);
removeCellsFromPlayerShroud = p => p.Shroud.RemoveVisibility(self); removeCellsFromPlayerShroud = p => p.Shroud.RemoveVisibility(self);
@@ -66,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (lobbyShroudFogDisabled || !self.IsInWorld) if (!self.IsInWorld)
return; return;
var centerPosition = self.CenterPosition; var centerPosition = self.CenterPosition;