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

Account for disabled shroud/fog in ShroudRenderer.

Browse Source 
Fixes #8827.
This commit is contained in:
Paul Chote
2015-08-03 20:34:22 +01:00
parent 34bf5b5810
commit 0b4543919d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

14
OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
View File

@@ -237,18 +237,18 @@ namespace OpenRA.Mods.Common.Traits
currentShroud.CellsChanged -= DirtyCells; currentShroud.CellsChanged -= DirtyCells;
if (shroud != null) if (shroud != null)
{
shroud.CellsChanged += DirtyCells; shroud.CellsChanged += DirtyCells;
// Needs the anonymous function to ensure the correct overload is chosen // Needs the anonymous function to ensure the correct overload is chosen
visibleUnderShroud = uv => currentShroud.IsExplored(uv); if (shroud != null && shroud.ShroudEnabled)
visibleUnderFog = uv => currentShroud.IsVisible(uv); visibleUnderShroud = puv => currentShroud.IsExplored(puv);
}
else else
{
visibleUnderShroud = puv => map.Contains(puv); visibleUnderShroud = puv => map.Contains(puv);
if (shroud != null && shroud.FogEnabled)
visibleUnderFog = puv => currentShroud.IsVisible(puv);
else
visibleUnderFog = puv => map.Contains(puv); visibleUnderFog = puv => map.Contains(puv);
}
currentShroud = shroud; currentShroud = shroud;
DirtyCells(map.ProjectedCellBounds); DirtyCells(map.ProjectedCellBounds);