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

more trivial cleanups

Browse Source
This commit is contained in:
Chris Forbes
2011-05-04 20:41:44 +12:00
parent 599ee25cb1
commit b12a35af4c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Player/PlaceBuilding.cs
View File

@@ -96,14 +96,14 @@ namespace OpenRA.Mods.RA
return; return;
var producers = self.World.ActorsWithTrait<Production>() var producers = self.World.ActorsWithTrait<Production>()
.Where( x => x.Actor.Owner == self.Owner ) .Where( x => x.Actor.Owner == self.Owner
.Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( bi.Queue ) ) && x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( bi.Queue ) )
.ToList(); .ToList();
var producer = producers.Where( x => x.Actor.IsPrimaryBuilding() ).Concat( producers ) var producer = producers.Where( x => x.Actor.IsPrimaryBuilding() ).Concat( producers )
.FirstOrDefault(); .FirstOrDefault();
if( producer.Actor != null ) if( producer.Actor != null )
producer.Actor.TraitsImplementing<RenderSimple>().First().PlayCustomAnim( producer.Actor, "build" ); producer.Actor.Trait<RenderSimple>().PlayCustomAnim( producer.Actor, "build" );
} }
static int GetNumBuildables(Player p) static int GetNumBuildables(Player p)

2
OpenRA.Mods.RA/Player/ProductionQueue.cs
View File

@@ -288,7 +288,7 @@ namespace OpenRA.Mods.RA
return true; return true;
} }
var sp = self.TraitsImplementing<Production>().Where(p => p.Info.Produces.Contains(Info.Type)).FirstOrDefault(); var sp = self.TraitsImplementing<Production>().FirstOrDefault(p => p.Info.Produces.Contains(Info.Type));
if (sp != null && !IsDisabledBuilding(self) && sp.Produce(self, Rules.Info[ name ])) if (sp != null && !IsDisabledBuilding(self) && sp.Produce(self, Rules.Info[ name ]))
{ {
FinishProduction(); FinishProduction();