diff --git a/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs b/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs index a584e1bdc9..476dec1005 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits public IEnumerable RenderAfterWorld(WorldRenderer wr) { - if (self.Owner != self.World.LocalPlayer) + if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) yield break; var range = self.TraitsImplementing() diff --git a/OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs b/OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs index 8cbc3d8150..ec53085129 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs @@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits Color.FromArgb(96, Color.Black)); foreach (var a in w.ActorsWithTrait()) - if (a.Actor.Owner == a.Actor.World.LocalPlayer) + if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer)) if (a.Actor.Info.Traits.Get().RangeCircleType == RangeCircleType) foreach (var r in a.Trait.RenderAfterWorld(wr)) yield return r; @@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits public IEnumerable RenderAfterWorld(WorldRenderer wr) { - if (self.Owner != self.World.LocalPlayer) + if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) yield break; var range = attack.GetMaximumRange(); diff --git a/OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs b/OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs index 16f30ac485..1d1b4be420 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs @@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits Color.FromArgb(96, Color.Black)); foreach (var a in w.ActorsWithTrait()) - 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)) yield return r; } @@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits public IEnumerable RenderAfterWorld(WorldRenderer wr) { - if (self.Owner != self.World.LocalPlayer) + if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) yield break; yield return new RangeCircleRenderable( diff --git a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs index 1f717d7096..c0cf90a06c 100644 --- a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs +++ b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs @@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Traits } foreach (var a in w.ActorsWithTrait()) - if (a.Actor.Owner == a.Actor.World.LocalPlayer) + if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer)) foreach (var r in a.Trait.RenderAfterWorld(wr)) yield return r; } @@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Traits public IEnumerable RenderAfterWorld(WorldRenderer wr) { - if (self.Owner != self.World.LocalPlayer) + if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) yield break; var jamsMissiles = self.Info.Traits.GetOrDefault(); diff --git a/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs b/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs index 052542c8a2..2cb961ca14 100644 --- a/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs +++ b/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Traits Color.FromArgb(96, Color.Black)); foreach (var a in w.ActorsWithTrait()) - if (a.Actor.Owner == a.Actor.World.LocalPlayer) + if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer)) foreach (var r in a.Trait.RenderAfterWorld(wr)) yield return r; } @@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Traits public IEnumerable RenderAfterWorld(WorldRenderer wr) { - if (self.Owner != self.World.LocalPlayer) + if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) yield break; yield return new RangeCircleRenderable(