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

Merge pull request #7231 from RoosterDragon/linq-checks

Browse Source 
Checked LINQ queries and collections for inefficiencies.
This commit is contained in:
Matthias Mailänder
2015-02-01 08:56:15 +01:00
parent b68918f5d5 82bea961ba
commit bcda232a1c
44 changed files with 151 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
View File

@@ -57,9 +57,9 @@ namespace OpenRA.Mods.D2k.Traits
var types = world.Selection.Actors.Where(a => a.IsInWorld && (a.World.LocalPlayer == a.Owner))
.SelectMany(a => a.TraitsImplementing<Production>())
.SelectMany(t => t.Info.Produces)
.ToArray();
.ToHashSet();
if (types.Length == 0)
if (types.Count == 0)
return;
palette.SetCurrentTab(world.LocalPlayer.PlayerActor.TraitsImplementing<ProductionQueue>()

6
OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
View File

@@ -215,12 +215,12 @@ namespace OpenRA.Mods.D2k.Widgets
if (queue != null)
{
var buildableItems = queue.BuildableItems().ToArray();
var allBuildables = queue.AllItems().OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder).ToArray();
var buildableItems = queue.BuildableItems().ToList();
var allBuildables = queue.AllItems().OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder).ToList();
var overlayBits = new List<Pair<Sprite, float2>>();
var textBits = new List<Pair<float2, string>>();
numActualRows = Math.Max((allBuildables.Count() + Columns - 1) / Columns, Rows);
numActualRows = Math.Max((allBuildables.Count + Columns - 1) / Columns, Rows);
// Palette Background
WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "top"), new float2(origin.X - 9, origin.Y - 9));