From 800acdbdf2eb2edb4977bf6645d16f28b624dc45 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 20 Jul 2013 13:54:11 +1200 Subject: [PATCH] Rename FindUnitsInCircle -> FindActorsInCircle. --- OpenRA.Game/WorldUtils.cs | 2 +- OpenRA.Mods.Cnc/Missions/Nod01Script.cs | 4 ++-- OpenRA.Mods.RA/AI/HackyAI.cs | 18 +++++++++--------- OpenRA.Mods.RA/Activities/FindResources.cs | 2 +- OpenRA.Mods.RA/Air/Helicopter.cs | 2 +- OpenRA.Mods.RA/AutoHeal.cs | 2 +- OpenRA.Mods.RA/AutoTarget.cs | 2 +- OpenRA.Mods.RA/Combat.cs | 2 +- OpenRA.Mods.RA/Missions/MissionUtils.cs | 4 ++-- OpenRA.Mods.RA/ProximityCapturable.cs | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenRA.Game/WorldUtils.cs b/OpenRA.Game/WorldUtils.cs index 9c866cdbab..b369857a74 100755 --- a/OpenRA.Game/WorldUtils.cs +++ b/OpenRA.Game/WorldUtils.cs @@ -55,7 +55,7 @@ namespace OpenRA return actors.OrderBy(a => (a.CenterPosition - pos).LengthSquared).FirstOrDefault(); } - public static IEnumerable FindUnitsInCircle(this World world, WPos origin, WRange r) + public static IEnumerable FindActorsInCircle(this World world, WPos origin, WRange r) { using (new PerfSample("FindUnitsInCircle")) { diff --git a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs index c4880834e4..f18ad93822 100644 --- a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs +++ b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs @@ -1,4 +1,4 @@ -#region Copyright & License Information +#region Copyright & License Information /* * Copyright 2007-2012 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made @@ -148,7 +148,7 @@ namespace OpenRA.Mods.Cnc.Missions IEnumerable UnitsNearActor(Actor actor, int range) { - return world.FindUnitsInCircle(actor.CenterPosition, WRange.FromCells(range)) + return world.FindActorsInCircle(actor.CenterPosition, WRange.FromCells(range)) .Where(a => a.IsInWorld && a != world.WorldActor && !a.Destroyed && a.HasTrait() && !a.Owner.NonCombatant); } diff --git a/OpenRA.Mods.RA/AI/HackyAI.cs b/OpenRA.Mods.RA/AI/HackyAI.cs index d9dc725ef5..394510ae82 100644 --- a/OpenRA.Mods.RA/AI/HackyAI.cs +++ b/OpenRA.Mods.RA/AI/HackyAI.cs @@ -168,7 +168,7 @@ namespace OpenRA.Mods.RA.AI if (owner.IsEmpty) return false; var u = owner.units.Random(owner.random); - var units = owner.world.FindUnitsInCircle(u.CenterPosition, WRange.FromCells(dangerRadius)).ToList(); + var units = owner.world.FindActorsInCircle(u.CenterPosition, WRange.FromCells(dangerRadius)).ToList(); var ownBaseBuildingAround = units.Where(unit => unit.Owner == owner.bot.p && unit.HasTrait()).ToList(); if (ownBaseBuildingAround.Count > 0) return false; @@ -325,7 +325,7 @@ namespace OpenRA.Mods.RA.AI protected static bool NearToPosSafely(Squad owner, WPos loc, out Actor detectedEnemyTarget) { detectedEnemyTarget = null; - var unitsAroundPos = owner.world.FindUnitsInCircle(loc, WRange.FromCells(dangerRadius)) + var unitsAroundPos = owner.world.FindActorsInCircle(loc, WRange.FromCells(dangerRadius)) .Where(unit => owner.bot.p.Stances[unit.Owner] == Stance.Enemy).ToList(); int missileUnitsCount = 0; @@ -509,7 +509,7 @@ namespace OpenRA.Mods.RA.AI owner.Target = t; } - var enemyUnits = owner.world.FindUnitsInCircle(owner.Target.CenterPosition, WRange.FromCells(10)) + var enemyUnits = owner.world.FindActorsInCircle(owner.Target.CenterPosition, WRange.FromCells(10)) .Where(unit => owner.bot.p.Stances[unit.Owner] == Stance.Enemy).ToList(); if (enemyUnits.Any()) @@ -554,7 +554,7 @@ namespace OpenRA.Mods.RA.AI Actor leader = owner.units.ClosestTo(owner.Target.CenterPosition); if (leader == null) return; - var ownUnits = owner.world.FindUnitsInCircle(leader.CenterPosition, WRange.FromCells(owner.units.Count) / 3) + var ownUnits = owner.world.FindActorsInCircle(leader.CenterPosition, WRange.FromCells(owner.units.Count) / 3) .Where(a => a.Owner == owner.units.FirstOrDefault().Owner && owner.units.Contains(a)).ToList(); if (ownUnits.Count < owner.units.Count) { @@ -564,7 +564,7 @@ namespace OpenRA.Mods.RA.AI } else { - var enemys = owner.world.FindUnitsInCircle(leader.CenterPosition, WRange.FromCells(12)) + var enemys = owner.world.FindActorsInCircle(leader.CenterPosition, WRange.FromCells(12)) .Where(a1 => !a1.Destroyed && !a1.IsDead()).ToList(); var enemynearby = enemys.Where(a1 => a1.HasTrait() && leader.Owner.Stances[a1.Owner] == Stance.Enemy).ToList(); if (enemynearby.Any()) @@ -1037,7 +1037,7 @@ namespace OpenRA.Mods.RA.AI internal Actor FindClosestEnemy(WPos pos, WRange radius) { - var enemyUnits = world.FindUnitsInCircle(pos, radius) + var enemyUnits = world.FindActorsInCircle(pos, radius) .Where(unit => p.Stances[unit.Owner] == Stance.Enemy && !unit.HasTrait() && unit.HasTrait()).ToList(); @@ -1194,7 +1194,7 @@ namespace OpenRA.Mods.RA.AI if (!allEnemyBaseBuilder.Any() || (ownUnits.Count < Info.SquadSize)) return; foreach (var b in allEnemyBaseBuilder) { - var enemys = world.FindUnitsInCircle(b.CenterPosition, WRange.FromCells(15)) + var enemys = world.FindActorsInCircle(b.CenterPosition, WRange.FromCells(15)) .Where(unit => p.Stances[unit.Owner] == Stance.Enemy && unit.HasTrait()).ToList(); rushFuzzy.CalculateFuzzy(ownUnits, enemys); @@ -1223,7 +1223,7 @@ namespace OpenRA.Mods.RA.AI protectSq.Target = attacker; if (protectSq.IsEmpty) { - var ownUnits = world.FindUnitsInCircle(baseCenter.CenterPosition, WRange.FromCells(15)) + var ownUnits = world.FindActorsInCircle(baseCenter.CenterPosition, WRange.FromCells(15)) .Where(unit => unit.Owner == p && !unit.HasTrait() && unit.HasTrait()).ToList(); foreach (var a in ownUnits) @@ -1340,7 +1340,7 @@ namespace OpenRA.Mods.RA.AI for (int j = 0; j < y; j += radiusOfPower * 2) { CPos pos = new CPos(i, j); - var targets = world.FindUnitsInCircle(pos.CenterPosition, WRange.FromCells(radiusOfPower)).ToList(); + var targets = world.FindActorsInCircle(pos.CenterPosition, WRange.FromCells(radiusOfPower)).ToList(); var enemys = targets.Where(unit => p.Stances[unit.Owner] == Stance.Enemy).ToList(); var ally = targets.Where(unit => p.Stances[unit.Owner] == Stance.Ally || unit.Owner == p).ToList(); diff --git a/OpenRA.Mods.RA/Activities/FindResources.cs b/OpenRA.Mods.RA/Activities/FindResources.cs index 895f3d0354..45513d0448 100755 --- a/OpenRA.Mods.RA/Activities/FindResources.cs +++ b/OpenRA.Mods.RA/Activities/FindResources.cs @@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA.Activities // TODO: calculate weapons ranges of units and factor those in instead of hard-coding 8. var path = self.World.WorldActor.Trait().FindPath( PathSearch.Search(self.World, mobileInfo, self, true) - .WithCustomCost(loc => self.World.FindUnitsInCircle(loc.CenterPosition, WRange.FromCells(8)) + .WithCustomCost(loc => self.World.FindActorsInCircle(loc.CenterPosition, WRange.FromCells(8)) .Where (u => !u.Destroyed && self.Owner.Stances[u.Owner] == Stance.Enemy) .Sum(u => Math.Max(0, 64 - (loc - u.Location).LengthSquared))) .WithHeuristic(loc => diff --git a/OpenRA.Mods.RA/Air/Helicopter.cs b/OpenRA.Mods.RA/Air/Helicopter.cs index 698b6b9d4e..103dfb971f 100755 --- a/OpenRA.Mods.RA/Air/Helicopter.cs +++ b/OpenRA.Mods.RA/Air/Helicopter.cs @@ -114,7 +114,7 @@ namespace OpenRA.Mods.RA.Air if (Altitude <= 0) return; var separation = new WRange(Info.IdealSeparation * 1024 / Game.CellSize); - var otherHelis = self.World.FindUnitsInCircle(self.CenterPosition, separation) + var otherHelis = self.World.FindActorsInCircle(self.CenterPosition, separation) .Where(a => a.HasTrait()); var f = otherHelis diff --git a/OpenRA.Mods.RA/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs index 94d078dfc5..50fad4dacb 100644 --- a/OpenRA.Mods.RA/AutoHeal.cs +++ b/OpenRA.Mods.RA/AutoHeal.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA public void TickIdle(Actor self) { var attack = self.Trait(); - var inRange = self.World.FindUnitsInCircle(self.CenterPosition, attack.GetMaximumRange()); + var inRange = self.World.FindActorsInCircle(self.CenterPosition, attack.GetMaximumRange()); var target = inRange .Where(a => a != self && a.AppearsFriendlyTo(self)) diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs index ec8bbc6490..19f06ada6a 100644 --- a/OpenRA.Mods.RA/AutoTarget.cs +++ b/OpenRA.Mods.RA/AutoTarget.cs @@ -119,7 +119,7 @@ namespace OpenRA.Mods.RA Actor ChooseTarget(Actor self, WRange range) { nextScanTime = self.World.SharedRandom.Next(Info.MinimumScanTimeInterval, Info.MaximumScanTimeInterval); - var inRange = self.World.FindUnitsInCircle(self.CenterPosition, range); + var inRange = self.World.FindActorsInCircle(self.CenterPosition, range); if (self.Owner.HasFogVisibility()) { diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index 7ccc5577f4..19adf9f5a0 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -106,7 +106,7 @@ namespace OpenRA.Mods.RA { var maxSpread = warhead.Spread * (float)Math.Log(Math.Abs(warhead.Damage), 2); var range = new WRange((int)maxSpread * 1024 / Game.CellSize); - var hitActors = world.FindUnitsInCircle(args.dest.ToWPos(0), range); + var hitActors = world.FindActorsInCircle(args.dest.ToWPos(0), range); foreach (var victim in hitActors) { diff --git a/OpenRA.Mods.RA/Missions/MissionUtils.cs b/OpenRA.Mods.RA/Missions/MissionUtils.cs index 43edc8f862..dee5e51339 100644 --- a/OpenRA.Mods.RA/Missions/MissionUtils.cs +++ b/OpenRA.Mods.RA/Missions/MissionUtils.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Missions { public static IEnumerable FindAliveCombatantActorsInCircle(this World world, WPos location, WRange range) { - return world.FindUnitsInCircle(location, range) + return world.FindActorsInCircle(location, range) .Where(u => u.IsInWorld && u != world.WorldActor && !u.IsDead() && !u.Owner.NonCombatant); } @@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Missions public static IEnumerable FindAliveNonCombatantActorsInCircle(this World world, WPos location, WRange range) { - return world.FindUnitsInCircle(location, range) + return world.FindActorsInCircle(location, range) .Where(u => u.IsInWorld && u != world.WorldActor && !u.IsDead() && u.Owner.NonCombatant); } diff --git a/OpenRA.Mods.RA/ProximityCapturable.cs b/OpenRA.Mods.RA/ProximityCapturable.cs index c86aa4a4f8..8aea2627cc 100644 --- a/OpenRA.Mods.RA/ProximityCapturable.cs +++ b/OpenRA.Mods.RA/ProximityCapturable.cs @@ -109,7 +109,7 @@ namespace OpenRA.Mods.RA IEnumerable UnitsInRange() { - return Self.World.FindUnitsInCircle(Self.CenterPosition, WRange.FromCells(Info.Range)) + return Self.World.FindActorsInCircle(Self.CenterPosition, WRange.FromCells(Info.Range)) .Where(a => a.IsInWorld && a != Self && !a.Destroyed) .Where(a => !a.Owner.NonCombatant); }