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

Prevent attack move crashing if selected actors die.

Browse Source 
- Cancel attack move if all actors die.
- Command bar no longer shows available actions from any dead units.
This commit is contained in:
RoosterDragon
2018-03-22 20:12:45 +00:00
committed by reaperrr
parent 7be71eb381
commit c9b19ffe52
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -165,6 +165,12 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public override void Tick(World world)
{
if (subjects.All(s => s.Actor.IsDead))
world.CancelInputMode();
}
public override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) public override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{ {
var prefix = mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove"; var prefix = mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove";

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
View File

@@ -267,7 +267,7 @@ namespace OpenRA.Mods.Common.Widgets
return; return;
selectedActors = world.Selection.Actors selectedActors = world.Selection.Actors
.Where(a => a.Owner == world.LocalPlayer && a.IsInWorld) .Where(a => a.Owner == world.LocalPlayer && a.IsInWorld && !a.IsDead)
.ToArray(); .ToArray();
attackMoveDisabled = !selectedActors.Any(a => a.Info.HasTraitInfo<AttackMoveInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>()); attackMoveDisabled = !selectedActors.Any(a => a.Info.HasTraitInfo<AttackMoveInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>());