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

...

Browse Source
This commit is contained in:
Paul Chote
2010-07-22 20:40:24 +12:00
parent 53304b3de2
commit 5ce8a643a7
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Traits/Building.cs
View File

@@ -164,8 +164,8 @@ namespace OpenRA.Traits
public IEnumerable<int2> RadarSignatureCells(Actor self) public IEnumerable<int2> RadarSignatureCells(Actor self)
{ {
foreach (var mod in self.World.Queries.WithTraitMultiple<IRadarVisibilityModifier>()) foreach (var mod in self.traits.WithInterface<IRadarVisibilityModifier>())
if (!mod.Trait.VisibleOnRadar(self)) if (!mod.VisibleOnRadar(self))
return new int2[] {}; return new int2[] {};
return Footprint.Tiles(self); return Footprint.Tiles(self);
@@ -173,8 +173,9 @@ namespace OpenRA.Traits
public Color RadarSignatureColor(Actor self) public Color RadarSignatureColor(Actor self)
{ {
foreach (var mod in self.World.Queries.WithTraitMultiple<IRadarColorModifier>()) var mod = self.traits.WithInterface<IRadarColorModifier>().FirstOrDefault();
return mod.Trait.RadarColorOverride(self); if (mod != null)
return mod.RadarColorOverride(self);
return self.Owner.Color; return self.Owner.Color;
} }

9
OpenRA.Game/Traits/Unit.cs
View File

@@ -39,8 +39,8 @@ namespace OpenRA.Traits
public IEnumerable<int2> RadarSignatureCells(Actor self) public IEnumerable<int2> RadarSignatureCells(Actor self)
{ {
foreach (var mod in self.World.Queries.WithTraitMultiple<IRadarVisibilityModifier>()) foreach (var mod in self.traits.WithInterface<IRadarVisibilityModifier>())
if (!mod.Trait.VisibleOnRadar(self)) if (!mod.VisibleOnRadar(self))
yield break; yield break;
yield return self.Location; yield return self.Location;
@@ -48,8 +48,9 @@ namespace OpenRA.Traits
public Color RadarSignatureColor(Actor self) public Color RadarSignatureColor(Actor self)
{ {
foreach (var mod in self.World.Queries.WithTraitMultiple<IRadarColorModifier>()) var mod = self.traits.WithInterface<IRadarColorModifier>().FirstOrDefault();
return mod.Trait.RadarColorOverride(self); if (mod != null)
return mod.RadarColorOverride(self);
return self.Owner.Color; return self.Owner.Color;
} }