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

move pixel doubling and health bar hotkeys to shared widget

Browse Source 
closes #5572
This commit is contained in:
Matthias Mailänder
2014-06-07 12:26:58 +02:00
parent f06cbfa5fe
commit 3a1c41c8ce
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -198,15 +198,17 @@ namespace OpenRA.Widgets
{ {
if (e.Event == KeyInputEvent.Down) if (e.Event == KeyInputEvent.Down)
{ {
if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators var key = Hotkey.FromKeyInput(e);
if (key == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators
World.SetPauseState(!World.Paused); World.SetPauseState(!World.Paused);
else if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.SelectAllUnitsKey) else if (key == Game.Settings.Keys.SelectAllUnitsKey)
{ {
var ownUnitsOnScreen = SelectActorsInBox(World, worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.BottomRight, var ownUnitsOnScreen = SelectActorsInBox(World, worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.BottomRight,
a => a.Owner == World.RenderPlayer); a => a.Owner == World.RenderPlayer);
World.Selection.Combine(World, ownUnitsOnScreen, false, false); World.Selection.Combine(World, ownUnitsOnScreen, false, false);
} }
else if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.SelectUnitsByTypeKey) else if (key == Game.Settings.Keys.SelectUnitsByTypeKey)
{ {
var selectedTypes = World.Selection.Actors.Where( var selectedTypes = World.Selection.Actors.Where(
x => x.Owner == World.RenderPlayer).Select(a => a.Info); x => x.Owner == World.RenderPlayer).Select(a => a.Info);
@@ -222,8 +224,13 @@ namespace OpenRA.Widgets
World.Map.Bounds.BottomRightAsCPos().BottomRight).Where(cond); World.Map.Bounds.BottomRightAsCPos().BottomRight).Where(cond);
Game.Debug("Selected across map"); Game.Debug("Selected across map");
} }
World.Selection.Combine(World, newSelection, true, false); World.Selection.Combine(World, newSelection, true, false);
} }
else if (key == Game.Settings.Keys.ToggleStatusBarsKey)
return ToggleStatusBars();
else if (key == Game.Settings.Keys.TogglePixelDoubleKey)
return TogglePixelDouble();
} }
return false; return false;
@@ -239,6 +246,19 @@ namespace OpenRA.Widgets
.DefaultIfEmpty(NoActors) .DefaultIfEmpty(NoActors)
.FirstOrDefault(); .FirstOrDefault();
} }
bool ToggleStatusBars()
{
Game.Settings.Game.AlwaysShowStatusBars ^= true;
return true;
}
bool TogglePixelDouble()
{
Game.Settings.Graphics.PixelDouble ^= true;
worldRenderer.Viewport.Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
return true;
}
} }
static class PriorityExts static class PriorityExts

20
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

@@ -62,11 +62,6 @@ namespace OpenRA.Mods.RA.Widgets
if (key == ks.ToSelectionKey) if (key == ks.ToSelectionKey)
return ToSelection(); return ToSelection();
if (key == ks.ToggleStatusBarsKey)
return ToggleStatusBars();
if (key == ks.TogglePixelDoubleKey)
return TogglePixelDouble();
// Put all functions that aren't unit-specific before this line! // Put all functions that aren't unit-specific before this line!
if (!world.Selection.Actors.Any()) if (!world.Selection.Actors.Any())
@@ -135,7 +130,7 @@ namespace OpenRA.Mods.RA.Widgets
bool PerformDeploy() bool PerformDeploy()
{ {
/* hack: multiple orders here */ // HACK: multiple orders here
PerformKeyboardOrderOnSelection(a => new Order("ReturnToBase", a, false)); PerformKeyboardOrderOnSelection(a => new Order("ReturnToBase", a, false));
PerformKeyboardOrderOnSelection(a => new Order("DeployTransform", a, false)); PerformKeyboardOrderOnSelection(a => new Order("DeployTransform", a, false));
PerformKeyboardOrderOnSelection(a => new Order("Unload", a, false)); PerformKeyboardOrderOnSelection(a => new Order("Unload", a, false));
@@ -250,18 +245,5 @@ namespace OpenRA.Mods.RA.Widgets
worldRenderer.Viewport.Center(world.Selection.Actors); worldRenderer.Viewport.Center(world.Selection.Actors);
return true; return true;
} }
static bool ToggleStatusBars()
{
Game.Settings.Game.AlwaysShowStatusBars ^= true;
return true;
}
bool TogglePixelDouble()
{
Game.Settings.Graphics.PixelDouble ^= true;
worldRenderer.Viewport.Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
return true;
}
} }
} }