Use map rules to build the editor sidebar.

This commit is contained in:
Paul Chote
2015-12-21 15:05:44 +00:00
parent fef25c7269
commit 95629c29a4

View File

@@ -29,16 +29,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly DropDownButtonWidget ownersDropDown; readonly DropDownButtonWidget ownersDropDown;
readonly ScrollPanelWidget panel; readonly ScrollPanelWidget panel;
readonly ScrollItemWidget itemTemplate; readonly ScrollItemWidget itemTemplate;
readonly Ruleset modRules; readonly Ruleset mapRules;
readonly World world; readonly World world;
readonly WorldRenderer worldRenderer; readonly WorldRenderer worldRenderer;
PlayerReference selectedOwner; PlayerReference selectedOwner;
[ObjectCreator.UseCtor] [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.world = world;
this.worldRenderer = worldRenderer; this.worldRenderer = worldRenderer;
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
panel.RemoveChildren(); 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); .Select(a => a.Value);
foreach (var a in actors) foreach (var a in actors)