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

Replace MouseButtonPreference with MouseActionType.

Browse Source
This commit is contained in:
Paul Chote
2025-12-15 20:30:26 +00:00
committed by Gustas Kažukauskas
parent c588c3ef8d
commit 962e7e911d
27 changed files with 212 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ namespace OpenRA.Mods.Common.Widgets
readonly Color normalSelectionColor;
readonly Color altSelectionColor;
readonly Color ctrlSelectionColor;
readonly GameSettings gameSettings;
public readonly string ClickSound = ChromeMetrics.Get<string>("ClickSound");
public readonly string ClickDisabledSound = ChromeMetrics.Get<string>("ClickDisabledSound");
@@ -40,6 +41,7 @@ namespace OpenRA.Mods.Common.Widgets
public WorldInteractionControllerWidget(World world, WorldRenderer worldRenderer)
{
World = world;
gameSettings = Game.Settings.Game;
this.worldRenderer = worldRenderer;
if (!ChromeMetrics.TryGet("AltSelectionColor", out altSelectionColor))
altSelectionColor = Color.White;
@@ -84,8 +86,7 @@ namespace OpenRA.Mods.Common.Widgets
{
mousePos = worldRenderer.Viewport.ViewToWorldPx(mi.Location);
var useClassicMouseStyle = Game.Settings.Game.UseClassicMouseStyle;
var useClassicMouseStyle = gameSettings.UseClassicMouseStyle;
var multiClick = mi.MultiTapCount >= 2;
if (World.OrderGenerator is not UnitOrderGenerator uog)
@@ -218,7 +219,7 @@ namespace OpenRA.Mods.Common.Widgets
var mi = new MouseInput
{
Location = screenPos,
Button = Game.Settings.Game.MouseButtonPreference.Action,
Button = World.OrderGenerator.ActionButton,
Modifiers = Game.GetModifierKeys()
};