Merge pull request OpenRA#6027 from OpenRA/revert-5763-build-shift+keypress

ScottNZ · ScottNZ · commit ad5e1cbe3a4a · 2014-07-22T22:36:43.000+12:00
Revert "Make Shift+<Hotkey> queue five units/buildings. Fixes OpenRA#5544."
diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
@@ -523,7 +523,7 @@ bool DoBuildingHotkey(KeyInput e, World world)
 			if (!paletteOpen) return false;
 			if (CurrentQueue == null) return false;
 
-			var toBuild = CurrentQueue.BuildableItems().FirstOrDefault(b => b.Traits.Get<BuildableInfo>().Hotkey.Key == Hotkey.FromKeyInput(e).Key);
+			var toBuild = CurrentQueue.BuildableItems().FirstOrDefault(b => b.Traits.Get<BuildableInfo>().Hotkey == Hotkey.FromKeyInput(e));
 
 			if (toBuild != null)
 			{

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ bool DoBuildingHotkey(KeyInput e, World world)`
`523`	`523`	`if (!paletteOpen) return false;`
`524`	`524`	`if (CurrentQueue == null) return false;`
`525`	`525`
`526`		`- var toBuild = CurrentQueue.BuildableItems().FirstOrDefault(b => b.Traits.Get<BuildableInfo>().Hotkey.Key == Hotkey.FromKeyInput(e).Key);`
	`526`	`+ var toBuild = CurrentQueue.BuildableItems().FirstOrDefault(b => b.Traits.Get<BuildableInfo>().Hotkey == Hotkey.FromKeyInput(e));`
`527`	`527`
`528`	`528`	`if (toBuild != null)`
`529`	`529`	`{`