diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 0cc587b62b..a34ee90a6a 100755 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -241,6 +241,6 @@ namespace OpenRA.Traits public interface ITargetable { string[] TargetTypes { get; } - IEnumerable TargetableSquares( Actor self ); + IEnumerable TargetableCells( Actor self ); } } diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index 35723a7dcf..0688e76f56 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -223,7 +223,7 @@ namespace OpenRA.Mods.RA public static bool IsInRange( float2 attackOrigin, float range, Actor target ) { var rsq = range * range * Game.CellSize * Game.CellSize; - foreach( var cell in target.Trait().TargetableSquares( target ) ) + foreach( var cell in target.Trait().TargetableCells( target ) ) if( ( attackOrigin - cell * Game.CellSize ).LengthSquared < rsq ) return true; return false; diff --git a/OpenRA.Mods.RA/TargetableBuilding.cs b/OpenRA.Mods.RA/TargetableBuilding.cs index 2ea74c6bdd..91ca3a216b 100755 --- a/OpenRA.Mods.RA/TargetableBuilding.cs +++ b/OpenRA.Mods.RA/TargetableBuilding.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA public string[] TargetTypes { get { return info.TargetTypes; } } - public IEnumerable TargetableSquares( Actor self ) + public IEnumerable TargetableCells( Actor self ) { return self.Trait().OccupiedCells(); } diff --git a/OpenRA.Mods.RA/TargetableUnit.cs b/OpenRA.Mods.RA/TargetableUnit.cs index 3e5d01dc60..0b736bcfc5 100755 --- a/OpenRA.Mods.RA/TargetableUnit.cs +++ b/OpenRA.Mods.RA/TargetableUnit.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA public virtual string[] TargetTypes { get { return info.TargetTypes; } } - public virtual IEnumerable TargetableSquares( Actor self ) + public virtual IEnumerable TargetableCells( Actor self ) { yield return Util.CellContaining( self.CenterLocation ); }