From 2b3c65334dbed5ee8d2f5d39da8a3175a699bdcc Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 27 Jul 2015 18:22:14 +0100 Subject: [PATCH] Correct Contains check in ActorMap. --- OpenRA.Game/Traits/World/ActorMap.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenRA.Game/Traits/World/ActorMap.cs b/OpenRA.Game/Traits/World/ActorMap.cs index f6b8dc4a1d..ef489335d8 100644 --- a/OpenRA.Game/Traits/World/ActorMap.cs +++ b/OpenRA.Game/Traits/World/ActorMap.cs @@ -194,7 +194,7 @@ namespace OpenRA.Traits public IEnumerable GetUnitsAt(CPos a) { - if (!map.Contains(a)) + if (!influence.Contains(a)) yield break; for (var i = influence[a]; i != null; i = i.Next) @@ -204,7 +204,7 @@ namespace OpenRA.Traits public IEnumerable GetUnitsAt(CPos a, SubCell sub) { - if (!map.Contains(a)) + if (!influence.Contains(a)) yield break; for (var i = influence[a]; i != null; i = i.Next) @@ -249,7 +249,7 @@ namespace OpenRA.Traits // NOTE: always includes transients with influence public bool AnyUnitsAt(CPos a) { - if (!map.Contains(a)) + if (!influence.Contains(a)) return false; return influence[a] != null; @@ -258,7 +258,7 @@ namespace OpenRA.Traits // NOTE: can not check aircraft public bool AnyUnitsAt(CPos a, SubCell sub, bool checkTransient = true) { - if (!map.Contains(a)) + if (!influence.Contains(a)) return false; var always = sub == SubCell.FullCell || sub == SubCell.Any; @@ -281,7 +281,7 @@ namespace OpenRA.Traits // NOTE: can not check aircraft public bool AnyUnitsAt(CPos a, SubCell sub, Func withCondition) { - if (!map.Contains(a)) + if (!influence.Contains(a)) return false; var always = sub == SubCell.FullCell || sub == SubCell.Any; @@ -296,7 +296,7 @@ namespace OpenRA.Traits { foreach (var c in ios.OccupiedCells()) { - if (!map.Contains(c.First)) + if (!influence.Contains(c.First)) continue; influence[c.First] = new InfluenceNode { Next = influence[c.First], SubCell = c.Second, Actor = self }; @@ -312,7 +312,7 @@ namespace OpenRA.Traits { foreach (var c in ios.OccupiedCells()) { - if (!map.Contains(c.First)) + if (!influence.Contains(c.First)) continue; var temp = influence[c.First]; @@ -381,7 +381,7 @@ namespace OpenRA.Traits foreach (var c in cells) { - if (!map.Contains(c)) + if (!influence.Contains(c)) continue; if (!cellTriggerInfluence.ContainsKey(c))