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

Fix a possible crash in WorldInteractionControllerWidget

Browse Source
This commit is contained in:
abcdefg30
2015-10-05 17:23:42 +02:00
parent 36b7524d37
commit d7c0d4197c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -89,8 +89,8 @@ namespace OpenRA.Widgets
{ {
if (!hasBox && World.Selection.Actors.Any() && !multiClick) if (!hasBox && World.Selection.Actors.Any() && !multiClick)
{ {
if (!(World.ScreenMap.ActorsAt(xy).Where(x => x.Info.HasTraitInfo<SelectableInfo>() && if (!(World.ScreenMap.ActorsAt(xy).Any(x => x.Info.HasTraitInfo<SelectableInfo>() &&
(x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x))).Any() && !mi.Modifiers.HasModifier(Modifiers.Ctrl) && (x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x))) && !mi.Modifiers.HasModifier(Modifiers.Ctrl) &&
!mi.Modifiers.HasModifier(Modifiers.Alt) && UnitOrderGenerator.InputOverridesSelection(World, xy, mi))) !mi.Modifiers.HasModifier(Modifiers.Alt) && UnitOrderGenerator.InputOverridesSelection(World, xy, mi)))
{ {
// Order units instead of selecting // Order units instead of selecting
@@ -242,7 +242,7 @@ namespace OpenRA.Widgets
{ {
// Get all the selected actors' selection classes // Get all the selected actors' selection classes
var selectedClasses = World.Selection.Actors var selectedClasses = World.Selection.Actors
.Where(x => x.Owner == player) .Where(x => !x.IsDead && x.Owner == player)
.Select(a => a.Trait<Selectable>().Class) .Select(a => a.Trait<Selectable>().Class)
.ToHashSet(); .ToHashSet();