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

Avoid multiple ToMPos calls in ActorMap.

Browse Source
This commit is contained in:
RoosterDragon
2015-08-20 19:14:46 +01:00
parent ac1658c9ce
commit 18478646d4
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -188,20 +188,22 @@ namespace OpenRA.Traits
public IEnumerable<Actor> GetUnitsAt(CPos a) public IEnumerable<Actor> GetUnitsAt(CPos a)
{ {
if (!influence.Contains(a)) var uv = a.ToMPos(map);
if (!influence.Contains(uv))
yield break; yield break;
for (var i = influence[a]; i != null; i = i.Next) for (var i = influence[uv]; i != null; i = i.Next)
if (!i.Actor.Disposed) if (!i.Actor.Disposed)
yield return i.Actor; yield return i.Actor;
} }
public IEnumerable<Actor> GetUnitsAt(CPos a, SubCell sub) public IEnumerable<Actor> GetUnitsAt(CPos a, SubCell sub)
{ {
if (!influence.Contains(a)) var uv = a.ToMPos(map);
if (!influence.Contains(uv))
yield break; yield break;
for (var i = influence[a]; i != null; i = i.Next) for (var i = influence[uv]; i != null; i = i.Next)
if (!i.Actor.Disposed && (i.SubCell == sub || i.SubCell == SubCell.FullCell)) if (!i.Actor.Disposed && (i.SubCell == sub || i.SubCell == SubCell.FullCell))
yield return i.Actor; yield return i.Actor;
} }
@@ -243,20 +245,22 @@ namespace OpenRA.Traits
// NOTE: always includes transients with influence // NOTE: always includes transients with influence
public bool AnyUnitsAt(CPos a) public bool AnyUnitsAt(CPos a)
{ {
if (!influence.Contains(a)) var uv = a.ToMPos(map);
if (!influence.Contains(uv))
return false; return false;
return influence[a] != null; return influence[uv] != null;
} }
// NOTE: can not check aircraft // NOTE: can not check aircraft
public bool AnyUnitsAt(CPos a, SubCell sub, bool checkTransient = true) public bool AnyUnitsAt(CPos a, SubCell sub, bool checkTransient = true)
{ {
if (!influence.Contains(a)) var uv = a.ToMPos(map);
if (!influence.Contains(uv))
return false; return false;
var always = sub == SubCell.FullCell || sub == SubCell.Any; var always = sub == SubCell.FullCell || sub == SubCell.Any;
for (var i = influence[a]; i != null; i = i.Next) for (var i = influence[uv]; i != null; i = i.Next)
{ {
if (always || i.SubCell == sub || i.SubCell == SubCell.FullCell) if (always || i.SubCell == sub || i.SubCell == SubCell.FullCell)
{ {
@@ -275,11 +279,12 @@ namespace OpenRA.Traits
// NOTE: can not check aircraft // NOTE: can not check aircraft
public bool AnyUnitsAt(CPos a, SubCell sub, Func<Actor, bool> withCondition) public bool AnyUnitsAt(CPos a, SubCell sub, Func<Actor, bool> withCondition)
{ {
if (!influence.Contains(a)) var uv = a.ToMPos(map);
if (!influence.Contains(uv))
return false; return false;
var always = sub == SubCell.FullCell || sub == SubCell.Any; var always = sub == SubCell.FullCell || sub == SubCell.Any;
for (var i = influence[a]; i != null; i = i.Next) for (var i = influence[uv]; i != null; i = i.Next)
if ((always || i.SubCell == sub || i.SubCell == SubCell.FullCell) && !i.Actor.Disposed && withCondition(i.Actor)) if ((always || i.SubCell == sub || i.SubCell == SubCell.FullCell) && !i.Actor.Disposed && withCondition(i.Actor))
return true; return true;
@@ -290,10 +295,11 @@ namespace OpenRA.Traits
{ {
foreach (var c in ios.OccupiedCells()) foreach (var c in ios.OccupiedCells())
{ {
if (!influence.Contains(c.First)) var uv = c.First.ToMPos(map);
if (!influence.Contains(uv))
continue; continue;
influence[c.First] = new InfluenceNode { Next = influence[c.First], SubCell = c.Second, Actor = self }; influence[uv] = new InfluenceNode { Next = influence[uv], SubCell = c.Second, Actor = self };
List<CellTrigger> triggers; List<CellTrigger> triggers;
if (cellTriggerInfluence.TryGetValue(c.First, out triggers)) if (cellTriggerInfluence.TryGetValue(c.First, out triggers))
@@ -306,12 +312,13 @@ namespace OpenRA.Traits
{ {
foreach (var c in ios.OccupiedCells()) foreach (var c in ios.OccupiedCells())
{ {
if (!influence.Contains(c.First)) var uv = c.First.ToMPos(map);
if (!influence.Contains(uv))
continue; continue;
var temp = influence[c.First]; var temp = influence[uv];
RemoveInfluenceInner(ref temp, self); RemoveInfluenceInner(ref temp, self);
influence[c.First] = temp; influence[uv] = temp;
List<CellTrigger> triggers; List<CellTrigger> triggers;
if (cellTriggerInfluence.TryGetValue(c.First, out triggers)) if (cellTriggerInfluence.TryGetValue(c.First, out triggers))