From 95629c29a4a7256b8adbe89ef535c583d04e366b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 21 Dec 2015 15:05:44 +0000 Subject: [PATCH] Use map rules to build the editor sidebar. --- .../Widgets/Logic/Editor/ActorSelectorLogic.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs index edf40a71ec..aa7c48798b 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs @@ -29,16 +29,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic readonly DropDownButtonWidget ownersDropDown; readonly ScrollPanelWidget panel; readonly ScrollItemWidget itemTemplate; - readonly Ruleset modRules; + readonly Ruleset mapRules; readonly World world; readonly WorldRenderer worldRenderer; PlayerReference selectedOwner; [ObjectCreator.UseCtor] - public ActorSelectorLogic(Widget widget, World world, WorldRenderer worldRenderer, Ruleset modRules) + public ActorSelectorLogic(Widget widget, World world, WorldRenderer worldRenderer) { - this.modRules = modRules; + this.mapRules = world.Map.Rules; this.world = world; this.worldRenderer = worldRenderer; @@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic { panel.RemoveChildren(); - var actors = modRules.Actors.Where(a => !a.Value.Name.Contains('^')) + var actors = mapRules.Actors.Where(a => !a.Value.Name.Contains('^')) .Select(a => a.Value); foreach (var a in actors)