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

Fix map parameter warning as error from PR 13233

Browse Source
This commit is contained in:
rob-v
2017-05-17 19:01:03 +02:00
committed by abcdefg30
parent 127ef8bb27
commit 3258d89651
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,8 +131,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
{ "orderManager", orderManager }, { "orderManager", orderManager },
{ "getMap", (Func<MapPreview>)(() => map) }, { "getMap", (Func<MapPreview>)(() => map) },
{ "onMouseDown", (Action<MapPreviewWidget, MapPreview, MouseInput>)((preview, map, mi) => LobbyUtils.SelectSpawnPoint(orderManager, preview, map, mi)) }, { "onMouseDown", (Action<MapPreviewWidget, MapPreview, MouseInput>)((preview, mapPreview, mi) =>
{ "getSpawnOccupants", (Func<MapPreview, Dictionary<CPos, SpawnOccupant>>)(map => LobbyUtils.GetSpawnOccupants(orderManager.LobbyInfo, map)) }, LobbyUtils.SelectSpawnPoint(orderManager, preview, mapPreview, mi)) },
{ "getSpawnOccupants", (Func<MapPreview, Dictionary<CPos, SpawnOccupant>>)(mapPreview => LobbyUtils.GetSpawnOccupants(orderManager.LobbyInfo, mapPreview)) },
}); });
UpdateCurrentMap(); UpdateCurrentMap();
@@ -380,9 +381,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}; };
var allOptions = new CachedTransform<MapPreview, LobbyOption[]>( var allOptions = new CachedTransform<MapPreview, LobbyOption[]>(
map => map.Rules.Actors["player"].TraitInfos<ILobbyOptions>() mapPreview => mapPreview.Rules.Actors["player"].TraitInfos<ILobbyOptions>()
.Concat(map.Rules.Actors["world"].TraitInfos<ILobbyOptions>()) .Concat(mapPreview.Rules.Actors["world"].TraitInfos<ILobbyOptions>())
.SelectMany(t => t.LobbyOptions(map.Rules)) .SelectMany(t => t.LobbyOptions(mapPreview.Rules))
.ToArray()); .ToArray());
foreach (var kv in optionDropdowns) foreach (var kv in optionDropdowns)
@@ -394,7 +395,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
gs => gs.LobbyOptions[kv.Value]); gs => gs.LobbyOptions[kv.Value]);
var option = new CachedTransform<MapPreview, LobbyOption>( var option = new CachedTransform<MapPreview, LobbyOption>(
map => allOptions.Update(map).FirstOrDefault(o => o.Id == kv.Value)); mapPreview => allOptions.Update(mapPreview).FirstOrDefault(o => o.Id == kv.Value));
var getOptionLabel = new CachedTransform<string, string>(id => var getOptionLabel = new CachedTransform<string, string>(id =>
{ {

5
OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
View File

@@ -78,8 +78,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
{ "orderManager", null }, { "orderManager", null },
{ "getMap", (Func<MapPreview>)(() => map) }, { "getMap", (Func<MapPreview>)(() => map) },
{ "onMouseDown", (Action<MapPreviewWidget, MapPreview, MouseInput>)((preview, map, mi) => { }) }, { "onMouseDown", (Action<MapPreviewWidget, MapPreview, MouseInput>)((preview, mapPreview, mi) => { }) },
{ "getSpawnOccupants", (Func<MapPreview, Dictionary<CPos, SpawnOccupant>>)(map => LobbyUtils.GetSpawnOccupants(selectedReplay.GameInfo.Players, map)) }, { "getSpawnOccupants", (Func<MapPreview, Dictionary<CPos, SpawnOccupant>>)(mapPreview =>
LobbyUtils.GetSpawnOccupants(selectedReplay.GameInfo.Players, mapPreview)) },
}); });
var replayDuration = new CachedTransform<ReplayMetadata, string>(r => var replayDuration = new CachedTransform<ReplayMetadata, string>(r =>