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

Merge pull request #6949 from pchote/retire-classic-mouse

Browse Source 
Retire classic mouse orders
This commit is contained in:
obrakmann
2014-11-15 19:38:32 +01:00
parent 8005c98143 c8ed0fc75c
commit 2c3b812b26
12 changed files with 55 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{
if (mi.Button == Game.mouseButtonPreference.Cancel)
if (mi.Button == MouseButton.Left)
{
world.CancelInputMode();
yield break;

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

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

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

@@ -148,7 +148,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
{
if (mi.Button == Game.mouseButtonPreference.Cancel)
if (mi.Button == MouseButton.Left)
{
world.CancelInputMode();
yield break;

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

@@ -99,7 +99,7 @@ namespace OpenRA.Mods.RA.Widgets
if (actors.Any())
world.OrderGenerator = new GenericSelectTarget(actors,
"AttackMove", "attackmove", Game.mouseButtonPreference.Action);
"AttackMove", "attackmove", MouseButton.Right);
return true;
}