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

Merge pull request #9709 from reaperrr/unitsat-actorsat

Browse Source 
Rename ActorMap *UnitsAt* occurences to *ActorsAt*
This commit is contained in:
atlimit8
2015-10-21 09:56:41 -05:00
parent 5f3d735864 2f69711341
commit 1e890a921f
23 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Activities/LayMines.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.RA.Activities
static bool ShouldLayMine(Actor self, CPos p)
{
// If there is no unit (other than me) here, we want to place a mine here
return self.World.ActorMap.GetUnitsAt(p).All(a => a == self);
return self.World.ActorMap.GetActorsAt(p).All(a => a == self);
}
void LayMine(Actor self)

2
OpenRA.Mods.RA/Activities/Leap.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA.Activities
mobile.FinishedMoving(self);
mobile.IsMoving = false;
self.World.ActorMap.GetUnitsAt(mobile.ToCell, mobile.ToSubCell)
self.World.ActorMap.GetActorsAt(mobile.ToCell, mobile.ToSubCell)
.Except(new[] { self }).Where(t => weapon.IsValidAgainst(t, self))
.Do(t => t.Kill(self));

2
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA.Traits
var tiles = Self.World.Map.FindTilesInCircle(xy, range);
var units = new HashSet<Actor>();
foreach (var t in tiles)
units.UnionWith(Self.World.ActorMap.GetUnitsAt(t));
units.UnionWith(Self.World.ActorMap.GetActorsAt(t));
return units.Where(a => a.Info.HasTraitInfo<ChronoshiftableInfo>() &&
!a.TraitsImplementing<IPreventsTeleport>().Any(condition => condition.PreventsTeleport(a)));