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

Remove Combat.IsInRange(). Closes #3433.

Browse Source
This commit is contained in:
Paul Chote
2013-07-06 16:13:08 +12:00
parent 39e699d119
commit 34df1ab705
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.RA/Combat.cs
View File

@@ -207,29 +207,5 @@ namespace OpenRA.Mods.RA
if (weapon.ValidTargets.Contains("Water") && world.GetTerrainType(location) == "Water") return true; if (weapon.ValidTargets.Contains("Water") && world.GetTerrainType(location) == "Water") return true;
return false; return false;
} }
public static bool IsInRange(PPos attackOrigin, float range, Actor target)
{
var rsq = range * range * Game.CellSize * Game.CellSize;
foreach (var cell in target.Trait<ITargetable>().TargetableCells(target))
if ((attackOrigin - Util.CenterOfCell(cell)).LengthSquared <= rsq)
return true;
return false;
}
public static bool IsInRange(PPos attackOrigin, float range, PPos targetLocation)
{
var rsq = range * range * Game.CellSize * Game.CellSize;
return (attackOrigin - targetLocation).LengthSquared <= rsq;
}
public static bool IsInRange(PPos attackOrigin, float range, Target target)
{
if (!target.IsValid) return false;
if (target.IsActor)
return IsInRange(attackOrigin, range, target.Actor);
else
return IsInRange(attackOrigin, range, target.CenterLocation);
}
} }
} }