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

Allow non-hosts to open the map chooser

Browse Source
This commit is contained in:
Oliver Brakmann
2015-01-15 13:27:07 +01:00
parent c76fb51b14
commit 72c0f9b8dc
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -155,7 +155,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var mapButton = lobby.GetOrNull<ButtonWidget>("CHANGEMAP_BUTTON"); var mapButton = lobby.GetOrNull<ButtonWidget>("CHANGEMAP_BUTTON");
if (mapButton != null) if (mapButton != null)
{ {
mapButton.IsDisabled = configurationDisabled; mapButton.IsDisabled = () => gameStarting || panel == PanelType.Kick || panel == PanelType.ForceStart ||
orderManager.LocalClient == null || orderManager.LocalClient.IsReady;
mapButton.OnClick = () => mapButton.OnClick = () =>
{ {
var onSelect = new Action<string>(uid => var onSelect = new Action<string>(uid =>
@@ -173,7 +174,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
{ "initialMap", Map.Uid }, { "initialMap", Map.Uid },
{ "onExit", DoNothing }, { "onExit", DoNothing },
{ "onSelect", onSelect }, { "onSelect", Game.IsHost ? onSelect : null },
{ "filter", MapVisibility.Lobby }, { "filter", MapVisibility.Lobby },
}); });
}; };

15
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -36,7 +36,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var approving = new Action(() => { Ui.CloseWindow(); onSelect(selectedUid); }); var approving = new Action(() => { Ui.CloseWindow(); onSelect(selectedUid); });
var canceling = new Action(() => { Ui.CloseWindow(); onExit(); }); var canceling = new Action(() => { Ui.CloseWindow(); onExit(); });
widget.Get<ButtonWidget>("BUTTON_OK").OnClick = approving; var okButton = widget.Get<ButtonWidget>("BUTTON_OK");
okButton.Disabled = this.onSelect == null;
okButton.OnClick = approving;
widget.Get<ButtonWidget>("BUTTON_CANCEL").OnClick = canceling; widget.Get<ButtonWidget>("BUTTON_CANCEL").OnClick = canceling;
scrollpanel = widget.Get<ScrollPanelWidget>("MAP_LIST"); scrollpanel = widget.Get<ScrollPanelWidget>("MAP_LIST");
@@ -128,8 +130,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Access the minimap to trigger async generation of the minimap. // Access the minimap to trigger async generation of the minimap.
preview.GetMinimap(); preview.GetMinimap();
Action dblClick = () =>
{
if (onSelect != null)
{
Ui.CloseWindow();
onSelect(preview.Uid);
}
};
var item = ScrollItemWidget.Setup(preview.Uid, itemTemplate, () => selectedUid == preview.Uid, var item = ScrollItemWidget.Setup(preview.Uid, itemTemplate, () => selectedUid == preview.Uid,
() => selectedUid = preview.Uid, () => { Ui.CloseWindow(); onSelect(preview.Uid); }); () => selectedUid = preview.Uid, dblClick);
item.IsVisible = () => item.RenderBounds.IntersectsWith(scrollpanel.RenderBounds); item.IsVisible = () => item.RenderBounds.IntersectsWith(scrollpanel.RenderBounds);
var titleLabel = item.Get<LabelWidget>("TITLE"); var titleLabel = item.Get<LabelWidget>("TITLE");