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

Determine stance for spectators based on shroud selection

Browse Source
This commit is contained in:
Andrew Odintsov
2020-05-10 21:53:27 +01:00
committed by Paul Chote
parent 72c82cb080
commit bd0738c5c4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Player.cs
View File

@@ -225,7 +225,11 @@ namespace OpenRA
public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>(); public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
public bool IsAlliedWith(Player p) public bool IsAlliedWith(Player p)
{ {
// Observers are considered allies to active combatants // Current shroud selection is used to determine stance for spectators
if (p != null && p.Spectating && !NonCombatant && p.World.RenderPlayer != null)
return Stances[p.World.RenderPlayer] == Stance.Ally;
// Observers are considered allies if RenderPlayer property is null
return p == null || Stances[p] == Stance.Ally || (p.Spectating && !NonCombatant); return p == null || Stances[p] == Stance.Ally || (p.Spectating && !NonCombatant);
} }