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

Make the resource layer optional in the map editor.

Browse Source
This commit is contained in:
Matthias Mailänder
2021-04-05 22:05:12 +02:00
committed by Paul Chote
parent eec7de4646
commit fe129956bb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/EditorBrushes/EditorDefaultBrush.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Widgets
editorLayer = world.WorldActor.Trait<EditorActorLayer>(); editorLayer = world.WorldActor.Trait<EditorActorLayer>();
editorActionManager = world.WorldActor.Trait<EditorActionManager>(); editorActionManager = world.WorldActor.Trait<EditorActionManager>();
resourceLayer = world.WorldActor.Trait<IResourceLayer>(); resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>();
} }
long CalculateActorSelectionPriority(EditorActorPreview actor) long CalculateActorSelectionPriority(EditorActorPreview actor)
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Widgets
var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); var cell = worldRenderer.Viewport.ViewToWorld(mi.Location);
var underCursor = editorLayer.PreviewsAt(worldPixel).MinByOrDefault(CalculateActorSelectionPriority); var underCursor = editorLayer.PreviewsAt(worldPixel).MinByOrDefault(CalculateActorSelectionPriority);
var resourceUnderCursor = resourceLayer.GetResource(cell).Type; var resourceUnderCursor = resourceLayer?.GetResource(cell).Type;
if (underCursor != null) if (underCursor != null)
editorWidget.SetTooltip(underCursor.Tooltip); editorWidget.SetTooltip(underCursor.Tooltip);