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

Allow multiple ResourceRenderer traits.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-04-05 12:43:05 +02:00
committed by teinarss
parent 521b516bf9
commit ac381a6f58
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Widgets
public class ViewportControllerWidget : Widget public class ViewportControllerWidget : Widget
{ {
readonly ModData modData; readonly ModData modData;
readonly ResourceRenderer resourceRenderer; readonly IEnumerable<ResourceRenderer> resourceRenderers;
public readonly HotkeyReference ZoomInKey = new HotkeyReference(); public readonly HotkeyReference ZoomInKey = new HotkeyReference();
public readonly HotkeyReference ZoomOutKey = new HotkeyReference(); public readonly HotkeyReference ZoomOutKey = new HotkeyReference();
@@ -144,7 +144,7 @@ namespace OpenRA.Mods.Common.Widgets
tooltipContainer = Exts.Lazy(() => tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer)); Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
resourceRenderer = world.WorldActor.TraitOrDefault<ResourceRenderer>(); resourceRenderers = world.WorldActor.TraitsImplementing<ResourceRenderer>().ToArray();
} }
public override void Initialize(WidgetArgs args) public override void Initialize(WidgetArgs args)
@@ -266,13 +266,14 @@ namespace OpenRA.Mods.Common.Widgets
return; return;
} }
if (resourceRenderer != null) foreach (var resourceRenderer in resourceRenderers)
{ {
var resource = resourceRenderer.GetRenderedResourceType(cell); var resource = resourceRenderer.GetRenderedResourceType(cell);
if (resource != null) if (resource != null)
{ {
TooltipType = WorldTooltipType.Resource; TooltipType = WorldTooltipType.Resource;
ResourceTooltip = resource; ResourceTooltip = resource;
break;
} }
} }
} }