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

Merge pull request #8195 from obrakmann/fix8181_reveal_fakes_with_unit_selection_key

Browse Source 
Fix revealing fakes by double-clicking a building
This commit is contained in:
Pavel Penev
2015-05-22 17:09:00 +03:00
parent 66f99704a8 da16142412
commit beb1481107
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,10 +109,13 @@ namespace OpenRA.Widgets
var unit = World.ScreenMap.ActorsAt(xy)
.WithHighestSelectionPriority();
var newSelection2 = SelectActorsInBox(World, worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.BottomRight,
a => unit != null && a.Info.Name == unit.Info.Name && a.Owner == unit.Owner);
if (unit != null && unit.Owner == (World.RenderPlayer ?? World.LocalPlayer))
{
var newSelection2 = SelectActorsInBox(World, worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.BottomRight,
a => a.Owner == unit.Owner && a.Info.Name == unit.Info.Name);
World.Selection.Combine(World, newSelection2, true, false);
World.Selection.Combine(World, newSelection2, true, false);
}
}
else if (dragStart.HasValue)
{
@@ -217,25 +220,27 @@ namespace OpenRA.Widgets
public override bool HandleKeyPress(KeyInput e)
{
var player = World.RenderPlayer ?? World.LocalPlayer;
if (e.Event == KeyInputEvent.Down)
{
var key = Hotkey.FromKeyInput(e);
if (key == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators
World.SetPauseState(!World.Paused);
else if (key == Game.Settings.Keys.SelectAllUnitsKey && World.LocalPlayer != null)
else if (key == Game.Settings.Keys.SelectAllUnitsKey)
{
var ownUnitsOnScreen = SelectActorsInBox(World, worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.BottomRight,
a => a.Owner == World.LocalPlayer);
a => a.Owner == player);
World.Selection.Combine(World, ownUnitsOnScreen, false, false);
}
else if (key == Game.Settings.Keys.SelectUnitsByTypeKey && World.LocalPlayer != null)
else if (key == Game.Settings.Keys.SelectUnitsByTypeKey)
{
var selectedTypes = World.Selection.Actors
.Where(x => x.Owner == World.LocalPlayer)
.Where(x => x.Owner == player)
.Select(a => a.Info);
Func<Actor, bool> cond = a => a.Owner == World.LocalPlayer && selectedTypes.Contains(a.Info);
Func<Actor, bool> cond = a => a.Owner == player && selectedTypes.Contains(a.Info);
var tl = worldRenderer.Viewport.TopLeft;
var br = worldRenderer.Viewport.BottomRight;
var newSelection = SelectActorsInBox(World, tl, br, cond);