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

Extract loading of game rows into LoadGameRows method.

Browse Source
This commit is contained in:
rob-v
2017-06-10 22:56:38 +02:00
committed by abcdefg30
parent 53c7954f84
commit 3c323a8672
1 changed files with 107 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
OpenRA.Mods.Common/Widgets/Logic/MultiplayerLogic.cs
View File

@@ -392,13 +392,50 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void RefreshServerListInner(List<GameServer> games) void RefreshServerListInner(List<GameServer> games)
{ {
ScrollItemWidget nextServerRow = null; ScrollItemWidget nextServerRow = null;
var rows = new List<Widget>(); List<Widget> rows = null;
if (games != null) if (games != null)
rows = LoadGameRows(games, out nextServerRow);
Game.RunAfterTick(() =>
{ {
serverList.RemoveChildren();
SelectServer(null);
if (games == null)
{
searchStatus = SearchStatus.Failed;
return;
}
if (!rows.Any())
{
searchStatus = SearchStatus.NoGames;
return;
}
searchStatus = SearchStatus.Hidden;
// Search for any unknown maps
if (Game.Settings.Game.AllowDownloading)
modData.MapCache.QueryRemoteMapDetails(services.MapRepository, games.Where(g => !Filtered(g)).Select(g => g.Map));
foreach (var row in rows)
serverList.AddChild(row);
if (nextServerRow != null)
nextServerRow.OnClick();
});
}
List<Widget> LoadGameRows(List<GameServer> games, out ScrollItemWidget nextServerRow)
{
nextServerRow = null;
var rows = new List<Widget>();
var mods = games.GroupBy(g => g.Mods) var mods = games.GroupBy(g => g.Mods)
.OrderByDescending(g => GroupSortOrder(g.First())) .OrderByDescending(g => GroupSortOrder(g.First()))
.ThenByDescending(g => g.Count()); .ThenByDescending(g => g.Count());
foreach (var modGames in mods) foreach (var modGames in mods)
{ {
if (modGames.All(Filtered)) if (modGames.All(Filtered))
@@ -492,37 +529,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
} }
} }
}
Game.RunAfterTick(() => return rows;
{
serverList.RemoveChildren();
SelectServer(null);
if (games == null)
{
searchStatus = SearchStatus.Failed;
return;
}
if (!rows.Any())
{
searchStatus = SearchStatus.NoGames;
return;
}
searchStatus = SearchStatus.Hidden;
// Search for any unknown maps
if (Game.Settings.Game.AllowDownloading)
modData.MapCache.QueryRemoteMapDetails(services.MapRepository, games.Where(g => !Filtered(g)).Select(g => g.Map));
foreach (var row in rows)
serverList.AddChild(row);
if (nextServerRow != null)
nextServerRow.OnClick();
});
} }
void OpenLobby() void OpenLobby()