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

Add ITargetableCells interface

Browse Source
This commit is contained in:
reaperrr
2017-06-08 00:32:42 +02:00
parent 69aa4f5962
commit 9b137afa6d
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/HitShape.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits
public class HitShape : ConditionalTrait<HitShapeInfo>, ITargetablePositions
{
BodyOrientation orientation;
IOccupySpace occupy;
ITargetableCells targetableCells;
public HitShape(Actor self, HitShapeInfo info)
: base(info) { }
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
orientation = self.Trait<BodyOrientation>();
occupy = self.TraitOrDefault<IOccupySpace>();
targetableCells = self.TraitOrDefault<ITargetableCells>();
base.Created(self);
}
@@ -78,8 +78,8 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled)
yield break;
if (Info.UseOccupiedCellsOffsets && occupy != null)
foreach (var c in occupy.OccupiedCells())
if (Info.UseOccupiedCellsOffsets && targetableCells != null)
foreach (var c in targetableCells.TargetableCells())
yield return self.World.Map.CenterOfCell(c.First);
foreach (var o in Info.TargetableOffsets)