pull mouse button preference from global property

This commit is contained in:
Matthias Mailänder
2013-01-17 19:08:38 +01:00
committed by Chris Forbes
parent 2503ddfde4
commit c5313375f0
7 changed files with 38 additions and 20 deletions

View File

@@ -100,7 +100,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{
if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left))
if (mi.Button == Game.mouseButtonPreference.Cancel)
{
world.CancelInputMode();
yield break;
@@ -111,8 +111,7 @@ namespace OpenRA.Mods.RA
? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
.FirstOrDefault();
if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Left : MouseButton.Right)
&& underCursor == null)
if (mi.Button == Game.mouseButtonPreference.Action && underCursor == null)
{
minelayer.World.CancelInputMode();
yield return new Order("PlaceMinefield", minelayer, false) { TargetLocation = xy };