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

move order button hotkey logic to ingame chrome logic

Browse Source 
removes power-down again from cnc mod as it is not wanted there
This commit is contained in:
Matthias Mailänder
2013-03-23 09:47:35 +01:00
parent 57d85e2c97
commit 7f6eaf8d5e
3 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
View File

@@ -53,6 +53,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
objectivesButton.IsVisible = () => world.LocalPlayer != null; objectivesButton.IsVisible = () => world.LocalPlayer != null;
} }
var moneybin = gameRoot.Get("INGAME_MONEY_BIN");
moneybin.Get<OrderButtonWidget>("SELL").Key = Game.Settings.Keys.SellKey;
moneybin.Get<OrderButtonWidget>("POWER_DOWN").Key = Game.Settings.Keys.PowerDownKey;
moneybin.Get<OrderButtonWidget>("REPAIR").Key = Game.Settings.Keys.RepairKey;
optionsBG.Get<ButtonWidget>("DISCONNECT").OnClick = () => LeaveGame(optionsBG, world); optionsBG.Get<ButtonWidget>("DISCONNECT").OnClick = () => LeaveGame(optionsBG, world);
optionsBG.Get<ButtonWidget>("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU"); optionsBG.Get<ButtonWidget>("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU");

1
OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
View File

@@ -41,6 +41,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
w.Pressed = () => world.OrderGenerator is T; w.Pressed = () => world.OrderGenerator is T;
w.OnMouseDown = mi => world.ToggleInputMode<T>(); w.OnMouseDown = mi => world.ToggleInputMode<T>();
w.OnKeyPress = ki => world.ToggleInputMode<T>();
} }
} }
} }

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

@@ -53,15 +53,6 @@ namespace OpenRA.Mods.RA.Widgets
if (e.KeyName == Game.Settings.Keys.ToSelectionKey) if (e.KeyName == Game.Settings.Keys.ToSelectionKey)
return ToSelection(); return ToSelection();
if (e.KeyName == Game.Settings.Keys.SellKey)
return PerformSwitchToSellMode();
if (e.KeyName == Game.Settings.Keys.PowerDownKey)
return PerformSwitchToPowerDownMode();
if (e.KeyName == Game.Settings.Keys.RepairKey)
return PerformSwitchToRepairMode();
if (!World.Selection.Actors.Any()) // Put all functions, that are no unit-functions, before this line! if (!World.Selection.Actors.Any()) // Put all functions, that are no unit-functions, before this line!
return false; return false;
@@ -196,23 +187,5 @@ namespace OpenRA.Mods.RA.Widgets
Game.viewport.Center(World.Selection.Actors); Game.viewport.Center(World.Selection.Actors);
return true; return true;
} }
bool PerformSwitchToSellMode()
{
World.ToggleInputMode<SellOrderGenerator>();
return true;
}
bool PerformSwitchToPowerDownMode()
{
World.ToggleInputMode<PowerDownOrderGenerator>();
return true;
}
bool PerformSwitchToRepairMode()
{
World.ToggleInputMode<RepairOrderGenerator>();
return true;
}
} }
} }