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

Some minor cleanup in TraitDictionary and affected callsites.

Browse Source
This commit is contained in:
RoosterDragon
2014-06-14 08:17:26 +01:00
parent 50d3929862
commit 909c5c7037
5 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -121,7 +121,7 @@ namespace OpenRA.Mods.RA.Effects
var dist = targetPosition + offset - pos;
var desiredFacing = Traits.Util.GetFacing(dist, facing);
var desiredAltitude = targetPosition.Z;
var jammed = info.Jammable && world.ActorsWithTrait<JamsMissiles>().Any(j => JammedBy(j));
var jammed = info.Jammable && world.ActorsWithTrait<JamsMissiles>().Any(JammedBy);
if (jammed)
{

7
OpenRA.Mods.RA/PrimaryBuilding.cs
View File

@@ -69,9 +69,10 @@ namespace OpenRA.Mods.RA
foreach (var p in self.Info.Traits.Get<ProductionInfo>().Produces)
foreach (var b in self.World
.ActorsWithTrait<PrimaryBuilding>()
.Where(a => a.Actor.Owner == self.Owner)
.Where(x => x.Trait.IsPrimary
&& x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains(p)))
.Where(a =>
a.Actor.Owner == self.Owner &&
a.Trait.IsPrimary &&
a.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains(p)))
b.Trait.SetPrimaryProducer(b.Actor, false);
isPrimary = true;