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

Merge pull request #9545 from abcdefg30/selectcrash

Browse Source 
Fix a possible crash in WorldInteractionControllerWidget
This commit is contained in:
Oliver Brakmann
2015-10-07 19:32:14 +02:00
parent 7eb2c48a1e d7c0d4197c
commit 783928f20e
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 (!(World.ScreenMap.ActorsAt(xy).Where(x => x.Info.HasTraitInfo<SelectableInfo>() &&
(x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x))).Any() && !mi.Modifiers.HasModifier(Modifiers.Ctrl) &&
if (!(World.ScreenMap.ActorsAt(xy).Any(x => x.Info.HasTraitInfo<SelectableInfo>() &&
(x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x))) && !mi.Modifiers.HasModifier(Modifiers.Ctrl) &&
!mi.Modifiers.HasModifier(Modifiers.Alt) && UnitOrderGenerator.InputOverridesSelection(World, xy, mi)))
{
// Order units instead of selecting
@@ -242,7 +242,7 @@ namespace OpenRA.Widgets
{
// Get all the selected actors' selection classes
var selectedClasses = World.Selection.Actors
.Where(x => x.Owner == player)
.Where(x => !x.IsDead && x.Owner == player)
.Select(a => a.Trait<Selectable>().Class)
.ToHashSet();