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

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

@@ -30,6 +30,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public MapPreview MapPreview { get; private set; }
public Map Map { get; private set; }
readonly ModData modData;
readonly Action onStart;
readonly Action onExit;
readonly OrderManager orderManager;
@@ -110,11 +111,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
[ObjectCreator.UseCtor]
internal LobbyLogic(Widget widget, WorldRenderer worldRenderer, OrderManager orderManager,
internal LobbyLogic(Widget widget, ModData modData, WorldRenderer worldRenderer, OrderManager orderManager,
Action onExit, Action onStart, bool skirmishMode, Ruleset modRules)
{
MapPreview = MapCache.UnknownMap;
lobby = widget;
this.modData = modData;
this.orderManager = orderManager;
this.onStart = onStart;
this.onExit = onExit;
@@ -511,7 +513,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var gameSpeed = optionsBin.GetOrNull<DropDownButtonWidget>("GAMESPEED_DROPDOWNBUTTON");
if (gameSpeed != null)
{
var speeds = Game.ModData.Manifest.Get<GameSpeeds>().Speeds;
var speeds = modData.Manifest.Get<GameSpeeds>().Speeds;
gameSpeed.IsDisabled = configurationDisabled;
gameSpeed.GetText = () =>
@@ -738,7 +740,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (MapPreview.Uid == uid)
return;
var modData = Game.ModData;
MapPreview = modData.MapCache[uid];
Map = null;
if (MapPreview.Status == MapStatus.Available)
@@ -768,7 +769,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}).Start();
}
else if (Game.Settings.Game.AllowDownloading)
Game.ModData.MapCache.QueryRemoteMapDetails(new[] { uid });
modData.MapCache.QueryRemoteMapDetails(new[] { uid });
}
void UpdatePlayerList()