From 8d9f7b715d7b80c14fb003133d7edf57382bd419 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 29 Jul 2011 19:08:45 +1200 Subject: [PATCH] remove Lock Teams checkbox from RA lobby --- OpenRA.Mods.RA/RALoadScreen.cs | 1 - OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 10 ---------- mods/ra/chrome/lobby.yaml | 9 +-------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/OpenRA.Mods.RA/RALoadScreen.cs b/OpenRA.Mods.RA/RALoadScreen.cs index bd7cddf1f4..b3feccff6a 100644 --- a/OpenRA.Mods.RA/RALoadScreen.cs +++ b/OpenRA.Mods.RA/RALoadScreen.cs @@ -91,7 +91,6 @@ namespace OpenRA.Mods.RA var lobby = Game.OpenWindow(orderManager.world, "SERVER_LOBBY"); lobby.GetWidget("CHAT_DISPLAY").ClearChat(); lobby.GetWidget("CHANGEMAP_BUTTON").Visible = true; - lobby.GetWidget("LOCKTEAMS_CHECKBOX").Visible = true; lobby.GetWidget("ALLOWCHEATS_CHECKBOX").Visible = true; lobby.GetWidget("DISCONNECT_BUTTON").Visible = true; break; diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 59c23fe426..6d8b468daa 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -117,15 +117,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.LoadShellMap(); Widget.OpenWindow("MAINMENU_BG"); }; - - var lockTeamsCheckbox = lobby.GetWidget("LOCKTEAMS_CHECKBOX"); - lockTeamsCheckbox.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.LockTeams; - lockTeamsCheckbox.OnClick = () => - { - if (Game.IsHost) - orderManager.IssueOrder(Order.Command( - "lockteams {0}".F(!orderManager.LobbyInfo.GlobalSettings.LockTeams))); - }; var allowCheats = lobby.GetWidget("ALLOWCHEATS_CHECKBOX"); allowCheats.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.AllowCheats; @@ -141,7 +132,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic { mapButton.Visible = false; disconnectButton.Visible = false; - lockTeamsCheckbox.Visible = false; orderManager.IssueOrder(Order.Command("startgame")); }; diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml index 91141ca88a..1b8e84aee4 100644 --- a/mods/ra/chrome/lobby.yaml +++ b/mods/ra/chrome/lobby.yaml @@ -417,17 +417,10 @@ Background@SERVER_LOBBY: Height:25 Text:Disconnect Font:Bold - Checkbox@LOCKTEAMS_CHECKBOX: - Id:LOCKTEAMS_CHECKBOX - X: PARENT_RIGHT-154 - Y: PARENT_BOTTOM-229 - Width: 80 - Height: 20 - Text: Lock Teams Checkbox@ALLOWCHEATS_CHECKBOX: Id:ALLOWCHEATS_CHECKBOX X: PARENT_RIGHT-154 - Y: PARENT_BOTTOM-229+25 + Y: PARENT_BOTTOM-229 Width: 80 Height: 20 Text: Allow Cheats