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

let Chronotank/Minelayer accept left-click-orders

Browse Source
This commit is contained in:
Matthias Mailänder
2013-01-16 22:54:32 +01:00
committed by Chris Forbes
parent b356cca528
commit 2503ddfde4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/ChronoshiftDeploy.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi) public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left))
{ {
world.CancelInputMode(); world.CancelInputMode();
yield break; yield break;

7
OpenRA.Mods.RA/Minelayer.cs
View File

@@ -100,7 +100,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi) public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{ {
if (mi.Button == MouseButton.Left) if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left))
{ {
world.CancelInputMode(); world.CancelInputMode();
yield break; yield break;
@@ -111,7 +111,8 @@ namespace OpenRA.Mods.RA
? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue) ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
.FirstOrDefault(); .FirstOrDefault();
if( mi.Button == MouseButton.Right && underCursor == null ) if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Left : MouseButton.Right)
&& underCursor == null)
{ {
minelayer.World.CancelInputMode(); minelayer.World.CancelInputMode();
yield return new Order("PlaceMinefield", minelayer, false) { TargetLocation = xy }; yield return new Order("PlaceMinefield", minelayer, false) { TargetLocation = xy };
@@ -170,7 +171,7 @@ namespace OpenRA.Mods.RA
cursor = "ability"; cursor = "ability";
IsQueued = forceQueued; IsQueued = forceQueued;
return ( actorsAtLocation.Count == 0 && forceAttack ); return (actorsAtLocation.Count == 0 && forceAttack);
} }
public bool IsQueued { get; protected set; } public bool IsQueued { get; protected set; }
} }