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

Revert "Determine stance for spectators based on shroud selection"

Browse Source 
This reverts commit e459fde031e3cec120065883eea62a663a097123.
This commit is contained in:
Paul Chote
2020-10-29 22:10:02 +00:00
committed by abcdefg30
parent 774f2e0852
commit 9ddc9073c2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Player.cs
View File

@@ -225,11 +225,7 @@ 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)
{ {
// Current shroud selection is used to determine stance for spectators // Observers are considered allies to active combatants
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);
} }