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

Support multiple Production traits in WithProductionOverlay.

Browse Source
This commit is contained in:
abcdefg30
2018-11-03 15:01:41 +00:00
committed by abcdefg30
parent a03abe78af
commit c0ee199ad1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Render/WithProductionOverlay.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public class WithProductionOverlay : PausableConditionalTrait<WithProductionOverlayInfo>, INotifyDamageStateChanged, INotifyCreated, INotifyOwnerChanged public class WithProductionOverlay : PausableConditionalTrait<WithProductionOverlayInfo>, INotifyDamageStateChanged, INotifyCreated, INotifyOwnerChanged
{ {
readonly Animation overlay; readonly Animation overlay;
readonly ProductionInfo production; readonly ProductionInfo[] productionInfos;
ProductionQueue[] queues; ProductionQueue[] queues;
bool IsProducing bool IsProducing
@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var rs = self.Trait<RenderSprites>(); var rs = self.Trait<RenderSprites>();
var body = self.Trait<BodyOrientation>(); var body = self.Trait<BodyOrientation>();
production = self.Info.TraitInfo<ProductionInfo>(); productionInfos = self.Info.TraitInfos<ProductionInfo>().ToArray();
overlay = new Animation(self.World, rs.GetImage(self), () => IsTraitPaused); overlay = new Animation(self.World, rs.GetImage(self), () => IsTraitPaused);
overlay.PlayRepeating(info.Sequence); overlay.PlayRepeating(info.Sequence);
@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{ {
// Per-actor production // Per-actor production
queues = self.TraitsImplementing<ProductionQueue>() queues = self.TraitsImplementing<ProductionQueue>()
.Where(q => production.Produces.Contains(q.Info.Type)) .Where(q => productionInfos.Any(p => p.Produces.Contains(q.Info.Type)))
.Where(q => !Info.Queues.Any() || Info.Queues.Contains(q.Info.Type)) .Where(q => !Info.Queues.Any() || Info.Queues.Contains(q.Info.Type))
.ToArray(); .ToArray();
@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{ {
// Player-wide production // Player-wide production
queues = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>() queues = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>()
.Where(q => production.Produces.Contains(q.Info.Type)) .Where(q => productionInfos.Any(p => p.Produces.Contains(q.Info.Type)))
.Where(q => !Info.Queues.Any() || Info.Queues.Contains(q.Info.Type)) .Where(q => !Info.Queues.Any() || Info.Queues.Contains(q.Info.Type))
.ToArray(); .ToArray();
} }