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

Make ActorMap addition explicit.

Browse Source
This commit is contained in:
Paul Chote
2013-09-21 15:46:42 +12:00
parent 4a2a747556
commit b00cc6108d
8 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Waypoint.cs
View File

@@ -33,11 +33,13 @@ namespace OpenRA.Traits
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}
}

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

@@ -37,9 +37,6 @@ namespace OpenRA.Traits
{
map = world.Map;
influence = new InfluenceNode[world.Map.MapSize.X, world.Map.MapSize.Y];
world.ActorAdded += a => Add(a, a.OccupiesSpace);
world.ActorRemoved += a => Remove(a, a.OccupiesSpace);
}
public IEnumerable<Actor> GetUnitsAt(CPos a)
@@ -95,21 +92,19 @@ namespace OpenRA.Traits
return false;
}
public void Add(Actor self, IOccupySpace unit)
public void AddInfluence(Actor self, IOccupySpace ios)
{
if (unit != null)
foreach (var c in unit.OccupiedCells())
influence[c.First.X, c.First.Y] = new InfluenceNode { next = influence[c.First.X, c.First.Y], subCell = c.Second, actor = self };
foreach (var c in ios.OccupiedCells())
influence[c.First.X, c.First.Y] = new InfluenceNode { next = influence[c.First.X, c.First.Y], subCell = c.Second, actor = self };
}
public void Remove(Actor self, IOccupySpace unit)
public void RemoveInfluence(Actor self, IOccupySpace ios)
{
if (unit != null)
foreach (var c in unit.OccupiedCells())
RemoveInner(ref influence[c.First.X, c.First.Y], self);
foreach (var c in ios.OccupiedCells())
RemoveInfluenceInner(ref influence[c.First.X, c.First.Y], self);
}
void RemoveInner(ref InfluenceNode influenceNode, Actor toRemove)
void RemoveInfluenceInner(ref InfluenceNode influenceNode, Actor toRemove)
{
if (influenceNode == null)
return;
@@ -117,14 +112,7 @@ namespace OpenRA.Traits
influenceNode = influenceNode.next;
if (influenceNode != null)
RemoveInner(ref influenceNode.next, toRemove);
}
public void Update(Actor self, IOccupySpace unit)
{
Remove(self, unit);
if (!self.IsDead())
Add(self, unit);
RemoveInfluenceInner(ref influenceNode.next, toRemove);
}
}
}

2
OpenRA.Mods.RA/Air/Aircraft.cs
View File

@@ -115,11 +115,13 @@ namespace OpenRA.Mods.RA.Air
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}

2
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -160,11 +160,13 @@ namespace OpenRA.Mods.RA.Buildings
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}
}

6
OpenRA.Mods.RA/Crate.cs
View File

@@ -104,7 +104,7 @@ namespace OpenRA.Mods.RA
public void SetPosition(Actor self, CPos cell)
{
if (self.IsInWorld)
self.World.ActorMap.Remove(self, this);
self.World.ActorMap.RemoveInfluence(self, this);
Location = cell;
CenterPosition = cell.CenterPosition;
@@ -116,7 +116,7 @@ namespace OpenRA.Mods.RA
if (self.IsInWorld)
{
self.World.ActorMap.Add(self, this);
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Update(self);
}
}
@@ -128,11 +128,13 @@ namespace OpenRA.Mods.RA
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}
}

6
OpenRA.Mods.RA/Husk.cs
View File

@@ -72,20 +72,22 @@ namespace OpenRA.Mods.RA
public void SetPosition(Actor self, WPos pos)
{
self.World.ActorMap.Remove(self, this);
self.World.ActorMap.RemoveInfluence(self, this);
CenterPosition = pos;
TopLeft = pos.ToCPos();
self.World.ActorMap.Add(self, this);
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Update(self);
}
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}
}

2
OpenRA.Mods.RA/Mine.cs
View File

@@ -65,11 +65,13 @@ namespace OpenRA.Mods.RA
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}
}

6
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -237,11 +237,13 @@ namespace OpenRA.Mods.RA.Move
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ScreenMap.Remove(self);
}
@@ -442,13 +444,13 @@ namespace OpenRA.Mods.RA.Move
public void AddInfluence()
{
if (self.IsInWorld)
self.World.ActorMap.Add(self, this);
self.World.ActorMap.AddInfluence(self, this);
}
public void RemoveInfluence()
{
if (self.IsInWorld)
self.World.ActorMap.Remove(self, this);
self.World.ActorMap.RemoveInfluence(self, this);
}
public void Nudge(Actor self, Actor nudger, bool force)