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

Merge pull request #6305 from pchote/fix-shroud-clear

Browse Source 
Don’t clear shroud outside the map.
This commit is contained in:
Matthias Mailänder
2014-08-23 10:34:47 +02:00
parent 6bb392be11 2acfc23f18
commit c25c3441fb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ namespace OpenRA.Traits
public int Hash { get; private set; } public int Hash { get; private set; }
static readonly Func<CPos, bool> TruthPredicate = cell => true; static readonly Func<CPos, bool> TruthPredicate = cell => true;
readonly Func<CPos, bool> shroudEdgeTest;
readonly Func<CPos, bool> fastExploredTest; readonly Func<CPos, bool> fastExploredTest;
readonly Func<CPos, bool> slowExploredTest; readonly Func<CPos, bool> slowExploredTest;
readonly Func<CPos, bool> fastVisibleTest; readonly Func<CPos, bool> fastVisibleTest;
@@ -63,6 +64,7 @@ namespace OpenRA.Traits
fogVisibilities = Exts.Lazy(() => self.TraitsImplementing<IFogVisibilityModifier>().ToArray()); fogVisibilities = Exts.Lazy(() => self.TraitsImplementing<IFogVisibilityModifier>().ToArray());
shroudEdgeTest = cell => map.Contains(cell);
fastExploredTest = IsExploredCore; fastExploredTest = IsExploredCore;
slowExploredTest = IsExplored; slowExploredTest = IsExplored;
fastVisibleTest = IsVisibleCore; fastVisibleTest = IsVisibleCore;
@@ -217,7 +219,8 @@ namespace OpenRA.Traits
public void ExploreAll(World world) public void ExploreAll(World world)
{ {
explored.Clear(true); foreach (var cell in map.Cells)
explored[cell] = true;
Invalidate(); Invalidate();
} }
@@ -255,9 +258,9 @@ namespace OpenRA.Traits
if (!map.Cells.Contains(region)) if (!map.Cells.Contains(region))
return slowExploredTest; return slowExploredTest;
// If shroud isn't enabled, then we can see everything. // If shroud isn't enabled, then we can see everything inside the map.
if (!ShroudEnabled) if (!ShroudEnabled)
return TruthPredicate; return shroudEdgeTest;
// If shroud is enabled, we can use the fast test that just does the core check. // If shroud is enabled, we can use the fast test that just does the core check.
return fastExploredTest; return fastExploredTest;