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

Remove static Game.ModData references from widget logic.

Browse Source
This commit is contained in:
Paul Chote
2016-02-17 02:39:13 +00:00
parent ff2aabda9b
commit 84b470017f
20 changed files with 78 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly Color incompatibleGameStartedColor;
readonly Color gameStartedColor;
readonly Color incompatibleGameColor;
readonly ModData modData;
GameServer currentServer;
MapPreview currentMap;
@@ -68,8 +69,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
[ObjectCreator.UseCtor]
public MultiplayerLogic(Widget widget, Action onStart, Action onExit, string directConnectHost, int directConnectPort)
public MultiplayerLogic(Widget widget, ModData modData, Action onStart, Action onExit, string directConnectHost, int directConnectPort)
{
this.modData = modData;
this.onStart = onStart;
this.onExit = onExit;
@@ -321,7 +323,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return 0;
// Games for the current mod+version are sorted first
if (testEntry.ModId == Game.ModData.Manifest.Mod.Id)
if (testEntry.ModId == modData.Manifest.Mod.Id)
return 2;
// Followed by games for different mods that are joinable
@@ -331,7 +333,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void SelectServer(GameServer server)
{
currentServer = server;
currentMap = server != null ? Game.ModData.MapCache[server.Map] : null;
currentMap = server != null ? modData.MapCache[server.Map] : null;
}
void RefreshServerListInner(IEnumerable<GameServer> games)
@@ -438,7 +440,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Search for any unknown maps
if (Game.Settings.Game.AllowDownloading)
Game.ModData.MapCache.QueryRemoteMapDetails(games.Where(g => !Filtered(g)).Select(g => g.Map));
modData.MapCache.QueryRemoteMapDetails(games.Where(g => !Filtered(g)).Select(g => g.Map));
foreach (var row in rows)
serverList.AddChild(row);