diff --git a/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs index d36d9a0b4d..71f64cc395 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs @@ -34,7 +34,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic var devModeButton = Widget.RootWidget.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); devModeButton.OnClick = () => devmodeBG.Visible ^= true; - var devTrait = world.LocalPlayer.PlayerActor.Trait(); var shroudCheckbox = devmodeBG.GetWidget("CHECKBOX_SHROUD"); @@ -73,7 +72,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic devModeButton.IsVisible = () => { return world.LobbyInfo.GlobalSettings.AllowCheats; }; } - + public void Order(World world, string order) { world.IssueOrder(new Order(order, world.LocalPlayer.PlayerActor, false)); diff --git a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs index 2bda97a81f..929057f20a 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic int validPlayers = 0; readonly World world; - + [ObjectCreator.UseCtor] public DiplomacyLogic( [ObjectCreator.Param] World world ) { @@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic validPlayers = world.Players.Where(a => a != world.LocalPlayer && !a.NonCombatant).Count(); diplomacy.IsVisible = () => (validPlayers > 0); } - + // This is shit void LayoutDialog(Widget bg) { diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs index af09115153..7bc902458c 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs @@ -17,20 +17,20 @@ namespace OpenRA.Mods.RA.Widgets.Logic public class IngameChromeLogic { Widget gameRoot; - + [ObjectCreator.UseCtor] public IngameChromeLogic( [ObjectCreator.Param] World world ) { Game.AddChatLine += AddChatLine; Game.BeforeGameStart += UnregisterEvents; - + var r = Widget.RootWidget; gameRoot = r.GetWidget("INGAME_ROOT"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); - + r.GetWidget("INGAME_OPTIONS_BUTTON").OnClick = () => optionsBG.Visible = !optionsBG.Visible; - + optionsBG.GetWidget("DISCONNECT").OnClick = () => { optionsBG.Visible = false; @@ -39,11 +39,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic Widget.CloseWindow(); Widget.OpenWindow("MAINMENU_BG"); }; - + optionsBG.GetWidget("SETTINGS").OnClick = () => Widget.OpenWindow("SETTINGS_MENU"); optionsBG.GetWidget("MUSIC").OnClick = () => Widget.OpenWindow("MUSIC_MENU"); optionsBG.GetWidget("RESUME").OnClick = () => optionsBG.Visible = false; - + optionsBG.GetWidget("SURRENDER").OnClick = () => world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false)); optionsBG.GetWidget("SURRENDER").IsVisible = () => (world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined); @@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { return world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Undefined; }; - + postgameText.GetText = () => { var state = world.LocalPlayer.WinState; @@ -62,13 +62,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic (state == WinState.Lost ? "YOU ARE DEFEATED" : "YOU ARE VICTORIOUS"); }; } - + void UnregisterEvents() { Game.AddChatLine -= AddChatLine; Game.BeforeGameStart -= UnregisterEvents; } - + void AddChatLine(Color c, string from, string text) { gameRoot.GetWidget("CHAT_DISPLAY").AddLine(c, from, text);