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

Allow minefields to start and end on occupied cells.

Browse Source
This commit is contained in:
tovl
2019-08-31 13:27:22 +02:00
committed by RoosterDragon
parent 97fe36af5a
commit eb39080248
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Cnc/Traits/Minelayer.cs
View File

@@ -185,13 +185,7 @@ namespace OpenRA.Mods.Cnc.Traits
yield break;
}
var underCursor = world.ScreenMap.ActorsAtMouse(mi)
.Select(a => a.Actor)
.Where(a => !world.FogObscures(a))
.MaxByOrDefault(a => a.Info.HasTraitInfo<SelectableInfo>()
? a.Info.TraitInfo<SelectableInfo>().Priority : int.MinValue);
if (mi.Button == Game.Settings.Game.MouseButtonPreference.Action && underCursor == null)
if (mi.Button == Game.Settings.Game.MouseButtonPreference.Action)
{
minelayers.First().World.CancelInputMode();
foreach (var minelayer in minelayers)
@@ -252,7 +246,7 @@ namespace OpenRA.Mods.Cnc.Traits
cursor = "ability";
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
return !othersAtTarget.Any() && modifiers.HasModifier(TargetModifiers.ForceAttack);
return modifiers.HasModifier(TargetModifiers.ForceAttack);
}
public bool IsQueued { get; protected set; }