From be010249d7c2fb20d842adad9b7cc5cbd24f2160 Mon Sep 17 00:00:00 2001 From: atlimit8 Date: Fri, 18 Sep 2015 10:31:41 -0500 Subject: [PATCH] Replace only use of Linq syntax --- OpenRA.Mods.Common/Traits/Harvester.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Harvester.cs b/OpenRA.Mods.Common/Traits/Harvester.cs index 589c268708..d64dc13094 100644 --- a/OpenRA.Mods.Common/Traits/Harvester.cs +++ b/OpenRA.Mods.Common/Traits/Harvester.cs @@ -158,11 +158,13 @@ namespace OpenRA.Mods.Common.Traits public Actor ClosestProc(Actor self, Actor ignore) { // Find all refineries and their occupancy count: - var refs = ( - from r in self.World.ActorsWithTrait() - where r.Actor != ignore && r.Actor.Owner == self.Owner && IsAcceptableProcType(r.Actor) - let linkedHarvs = self.World.ActorsWithTrait().Count(a => a.Trait.LinkedProc == r.Actor) - select new { Location = r.Actor.Location + r.Trait.DeliveryOffset, Actor = r.Actor, Occupancy = linkedHarvs }).ToDictionary(r => r.Location); + var refs = self.World.ActorsWithTrait() + .Where(r => r.Actor != ignore && r.Actor.Owner == self.Owner && IsAcceptableProcType(r.Actor)) + .Select(r => new { + Location = r.Actor.Location + r.Trait.DeliveryOffset, + Actor = r.Actor, + Occupancy = self.World.ActorsWithTrait().Count(a => a.Trait.LinkedProc == r.Actor) }) + .ToDictionary(r => r.Location); // Start a search from each refinery's delivery location: var mi = self.Info.Traits.Get();