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

Make range circles visible to observers

Browse Source
This commit is contained in:
Oliver Brakmann
2015-06-22 17:11:43 +02:00
parent fc8a34a7a2
commit 82221f780f
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{ {
if (self.Owner != self.World.LocalPlayer) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break; yield break;
var range = self.TraitsImplementing<DetectCloaked>() var range = self.TraitsImplementing<DetectCloaked>()

4
OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits
Color.FromArgb(96, Color.Black)); Color.FromArgb(96, Color.Black));
foreach (var a in w.ActorsWithTrait<RenderRangeCircle>()) foreach (var a in w.ActorsWithTrait<RenderRangeCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer) if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
if (a.Actor.Info.Traits.Get<RenderRangeCircleInfo>().RangeCircleType == RangeCircleType) if (a.Actor.Info.Traits.Get<RenderRangeCircleInfo>().RangeCircleType == RangeCircleType)
foreach (var r in a.Trait.RenderAfterWorld(wr)) foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r; yield return r;
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{ {
if (self.Owner != self.World.LocalPlayer) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break; yield break;
var range = attack.GetMaximumRange(); var range = attack.GetMaximumRange();

4
OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
Color.FromArgb(96, Color.Black)); Color.FromArgb(96, Color.Black));
foreach (var a in w.ActorsWithTrait<WithRangeCircle>()) foreach (var a in w.ActorsWithTrait<WithRangeCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer && a.Trait.Info.Type == Type) if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer) && a.Trait.Info.Type == Type)
foreach (var r in a.Trait.RenderAfterWorld(wr)) foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r; yield return r;
} }
@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{ {
if (self.Owner != self.World.LocalPlayer) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break; yield break;
yield return new RangeCircleRenderable( yield return new RangeCircleRenderable(

4
OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Traits
} }
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>()) foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer) if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
foreach (var r in a.Trait.RenderAfterWorld(wr)) foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r; yield return r;
} }
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{ {
if (self.Owner != self.World.LocalPlayer) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break; yield break;
var jamsMissiles = self.Info.Traits.GetOrDefault<JamsMissilesInfo>(); var jamsMissiles = self.Info.Traits.GetOrDefault<JamsMissilesInfo>();

4
OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Traits
Color.FromArgb(96, Color.Black)); Color.FromArgb(96, Color.Black));
foreach (var a in w.ActorsWithTrait<RenderShroudCircle>()) foreach (var a in w.ActorsWithTrait<RenderShroudCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer) if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
foreach (var r in a.Trait.RenderAfterWorld(wr)) foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r; yield return r;
} }
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{ {
if (self.Owner != self.World.LocalPlayer) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break; yield break;
yield return new RangeCircleRenderable( yield return new RangeCircleRenderable(