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

Fix ready checkbox in the lobby being unusable after installing a map

Browse Source
This commit is contained in:
Oliver Brakmann
2016-04-11 22:25:18 +02:00
parent f911a80b04
commit b25eb81a42
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Map/MapPreview.cs
View File

@@ -355,6 +355,11 @@ namespace OpenRA
return true; return true;
} }
public void PreloadRules()
{
var unused = Rules;
}
public void UpdateRemoteSearch(MapStatus status, MiniYaml yaml, Action<MapPreview> parseMetadata = null) public void UpdateRemoteSearch(MapStatus status, MiniYaml yaml, Action<MapPreview> parseMetadata = null)
{ {
var newData = innerData.Clone(); var newData = innerData.Clone();

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

@@ -781,7 +781,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
new Task(() => new Task(() =>
{ {
// Force map rules to be loaded on this background thread // Force map rules to be loaded on this background thread
var unused = map.Rules; map.PreloadRules();
}).Start(); }).Start();
} }
@@ -799,7 +799,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
new Task(() => new Task(() =>
{ {
// Force map rules to be loaded on this background thread // Force map rules to be loaded on this background thread
var unused = currentMap.Rules; currentMap.PreloadRules();
Game.RunAfterTick(() => Game.RunAfterTick(() =>
{ {
// Map may have changed in the meantime // Map may have changed in the meantime

7
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyMapPreviewLogic.cs
View File

@@ -109,8 +109,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var install = download.GetOrNull<ButtonWidget>("MAP_INSTALL"); var install = download.GetOrNull<ButtonWidget>("MAP_INSTALL");
if (install != null) if (install != null)
{ {
install.OnClick = () => lobby.Map.Install( install.OnClick = () => lobby.Map.Install(() =>
() => orderManager.IssueOrder(Order.Command("state {0}".F(Session.ClientState.NotReady)))); {
lobby.Map.PreloadRules();
Game.RunAfterTick(() => orderManager.IssueOrder(Order.Command("state {0}".F(Session.ClientState.NotReady))));
});
install.IsHighlighted = () => installHighlighted; install.IsHighlighted = () => installHighlighted;
} }
} }

2
OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
View File

@@ -134,7 +134,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var p in allPreviews) foreach (var p in allPreviews)
{ {
p.GetMinimap(); p.GetMinimap();
var unused = p.Rules; p.PreloadRules();
} }
}).Start(); }).Start();