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

Remove WorldRenderer argument from InputOverridesSelection.

Browse Source
This commit is contained in:
Paul Chote
2019-10-28 23:50:58 +00:00
committed by abcdefg30
parent 0cfd6337ff
commit 9d4f683d80
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ namespace OpenRA.Mods.Common.Traits
return prefix + "-blocked";
}
public override bool InputOverridesSelection(WorldRenderer wr, World world, int2 xy, MouseInput mi)
public override bool InputOverridesSelection(World world, int2 xy, MouseInput mi)
{
// Custom order generators always override selection
return true;

2
OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -110,7 +110,7 @@ namespace OpenRA.Mods.Common.Widgets
var selectableActor = World.ScreenMap.ActorsAtMouse(mousePos).Select(a => a.Actor).Any(x =>
x.Info.HasTraitInfo<SelectableInfo>() && (x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x)));
if (!selectableActor || uog.InputOverridesSelection(worldRenderer, World, mousePos, mi))
if (!selectableActor || uog.InputOverridesSelection(World, mousePos, mi))
{
// Order units instead of selecting
ApplyOrders(World, mi);