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

Require explicit ITargetablePositions

Browse Source
This commit is contained in:
reaperrr
2017-09-27 23:08:43 +02:00
committed by abcdefg30
parent edeb980f5b
commit 7ca9679b34
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -354,6 +354,7 @@ namespace OpenRA.Traits
bool RequiresForceFire { get; } bool RequiresForceFire { get; }
} }
[RequireExplicitImplementation]
public interface ITargetablePositions public interface ITargetablePositions
{ {
IEnumerable<WPos> TargetablePositions(Actor self); IEnumerable<WPos> TargetablePositions(Actor self);

2
OpenRA.Mods.Common/Traits/CombatDebugOverlay.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits
s.Info.Type.DrawCombatOverlay(wr, wcr, self); s.Info.Type.DrawCombatOverlay(wr, wcr, self);
var tc = Color.Lime; var tc = Color.Lime;
var positions = activeShapes.SelectMany(tp => tp.TargetablePositions(self)); var positions = Target.FromActor(self).Positions;
foreach (var p in positions) foreach (var p in positions)
{ {
var center = wr.Screen3DPosition(p); var center = wr.Screen3DPosition(p);

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

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Traits
base.Created(self); base.Created(self);
} }
public IEnumerable<WPos> TargetablePositions(Actor self) IEnumerable<WPos> ITargetablePositions.TargetablePositions(Actor self)
{ {
if (IsTraitDisabled) if (IsTraitDisabled)
yield break; yield break;