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

Merge pull request #3003 from Mailaender/build-palette-hotkey-modifier

Browse Source 
Resolve hotkey conflicts between build palette and world command widget once and for all
This commit is contained in:
Chris Forbes
2013-04-08 15:27:53 -07:00
parent 8f7819fb24 70b40a54be
commit 66eff85aa4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GameRules/Settings.cs
View File

@@ -146,9 +146,9 @@ namespace OpenRA.GameRules
public string AttackMoveKey = "a"; public string AttackMoveKey = "a";
public string StopKey = "s"; public string StopKey = "s";
public string ScatterKey = "d"; public string ScatterKey = "x";
public string DeployKey = "f"; public string DeployKey = "f";
public string StanceCycleKey = "g"; public string StanceCycleKey = "z";
public string CycleTabsKey = "tab"; public string CycleTabsKey = "tab";
} }

7
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -150,8 +150,9 @@ namespace OpenRA.Mods.RA.Widgets
TabChange(e.Modifiers.HasModifier(Modifiers.Shift)); TabChange(e.Modifiers.HasModifier(Modifiers.Shift));
return true; return true;
} }
if (e.Modifiers == Modifiers.Alt)
return DoBuildingHotkey(e.KeyName, world); return DoBuildingHotkey(e.KeyName, world);
return false;
} }
public override bool HandleMouseInput(MouseInput mi) public override bool HandleMouseInput(MouseInput mi)
@@ -454,7 +455,7 @@ namespace OpenRA.Mods.RA.Widgets
WidgetUtils.DrawPanel("dialog4", new Rectangle(Game.viewport.Width - 300, pos.Y, 300, longDescSize + 65)); WidgetUtils.DrawPanel("dialog4", new Rectangle(Game.viewport.Width - 300, pos.Y, 300, longDescSize + 65));
Game.Renderer.Fonts["Bold"].DrawText( Game.Renderer.Fonts["Bold"].DrawText(
tooltip.Name + ((buildable.Hotkey != null) ? " ({0})".F(buildable.Hotkey.ToUpper()) : ""), tooltip.Name + ((buildable.Hotkey != null) ? " (ALT + {0})".F(buildable.Hotkey.ToUpper()) : ""),
p.ToInt2() + new int2(5, 5), Color.White); p.ToInt2() + new int2(5, 5), Color.White);
var resources = pl.PlayerActor.Trait<PlayerResources>(); var resources = pl.PlayerActor.Trait<PlayerResources>();