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

Fix frozen actors being targetable under shroud. Fixes #5979, #5978.

Browse Source
This commit is contained in:
Paul Chote
2014-07-19 12:56:52 +12:00
parent 58abd45ed9
commit bcc32d15ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Orders
else else
{ {
var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi) var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
.Where(a => a.Info.Traits.Contains<ITargetableInfo>()) .Where(a => a.Info.Traits.Contains<ITargetableInfo>() && !a.Footprint.All(c => world.ShroudObscures(c)))
.WithHighestSelectionPriority(); .WithHighestSelectionPriority();
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy); target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
} }
@@ -74,7 +74,7 @@ namespace OpenRA.Orders
else else
{ {
var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi) var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
.Where(a => a.Info.Traits.Contains<ITargetableInfo>()) .Where(a => a.Info.Traits.Contains<ITargetableInfo>() && !a.Footprint.All(c => world.ShroudObscures(c)))
.WithHighestSelectionPriority(); .WithHighestSelectionPriority();
target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy); target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
} }