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

Merge pull request #8589 from obrakmann/fix8543_range-circles-in-replays

Browse Source 
Make range circles visible to observers
This commit is contained in:
Matthias Mailänder
2015-06-29 23:10:28 +02:00
parent fc34aa7e4f 82221f780f
commit 6582a0e096
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Player.cs
View File

@@ -140,7 +140,7 @@ namespace OpenRA
public bool IsAlliedWith(Player p)
{
// Observers are considered as allies
return p == null || Stances[p] == Stance.Ally;
return p == null || Stances[p] == Stance.Ally || p.Spectating;
}
public void SetStance(Player target, Stance s)

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)
{
if (self.Owner != self.World.LocalPlayer)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
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));
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)
foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r;
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.Owner != self.World.LocalPlayer)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
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));
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))
yield return r;
}
@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.Owner != self.World.LocalPlayer)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
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>())
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<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.Owner != self.World.LocalPlayer)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
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));
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))
yield return r;
}
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.Owner != self.World.LocalPlayer)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
yield return new RangeCircleRenderable(