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

Make MapPreviewLogic initialisers optional

Browse Source
This commit is contained in:
Gustas
2023-08-05 22:53:59 +03:00
committed by Matthias Mailänder
parent 3ecb267594
commit 0dcb341059
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs
View File

@@ -59,9 +59,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
var preview = parent.Get<MapPreviewWidget>("MAP_PREVIEW"); var preview = parent.Get<MapPreviewWidget>("MAP_PREVIEW");
preview.Preview = () => getMap().Map; preview.Preview = () => getMap().Map;
preview.OnMouseDown = mi => onMouseDown(preview, getMap().Map, mi); if (onMouseDown != null)
preview.SpawnOccupants = getSpawnOccupants; preview.OnMouseDown = mi => onMouseDown(preview, getMap().Map, mi);
preview.DisabledSpawnPoints = getDisabledSpawnPoints;
if (getSpawnOccupants != null)
preview.SpawnOccupants = getSpawnOccupants;
if (getDisabledSpawnPoints != null)
preview.DisabledSpawnPoints = getDisabledSpawnPoints;
preview.ShowUnoccupiedSpawnpoints = showUnoccupiedSpawnpoints; preview.ShowUnoccupiedSpawnpoints = showUnoccupiedSpawnpoints;
var titleLabel = parent.Get<LabelWithTooltipWidget>("MAP_TITLE"); var titleLabel = parent.Get<LabelWithTooltipWidget>("MAP_TITLE");

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

@@ -172,7 +172,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
{ "orderManager", null }, { "orderManager", null },
{ "getMap", (Func<(MapPreview, Session.MapStatus)>)(() => (map, Session.MapStatus.Playable)) }, { "getMap", (Func<(MapPreview, Session.MapStatus)>)(() => (map, Session.MapStatus.Playable)) },
{ "onMouseDown", (Action<MapPreviewWidget, MapPreview, MouseInput>)((preview, mapPreview, mi) => { }) }, { "onMouseDown", null },
{ "getSpawnOccupants", (Func<Dictionary<int, SpawnOccupant>>)(() => spawnOccupants.Update(selectedReplay)) }, { "getSpawnOccupants", (Func<Dictionary<int, SpawnOccupant>>)(() => spawnOccupants.Update(selectedReplay)) },
{ "getDisabledSpawnPoints", (Func<HashSet<int>>)(() => disabledSpawnPoints.Update(selectedReplay)) }, { "getDisabledSpawnPoints", (Func<HashSet<int>>)(() => disabledSpawnPoints.Update(selectedReplay)) },
{ "showUnoccupiedSpawnpoints", false }, { "showUnoccupiedSpawnpoints", false },