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

Merge pull request #10255 from pchote/campaign-colors-redo

Browse Source 
Enable original TD campaign colors.
This commit is contained in:
Oliver Brakmann
2015-12-25 19:48:18 +01:00
parent 39ffa18000 e11f49a773
commit 9ea2e0015d
25 changed files with 965 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
View File

@@ -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)