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

Merge pull request #8964 from Mailaender/human-observers

Browse Source 
Fixed neutral actors being visible in the All Players observer shroud mode
This commit is contained in:
abcdefg30
2015-08-06 14:13:18 +02:00
parent 8cb9dd5f25 6c45763d75
commit cf9ec29708
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Player.cs
View File

@@ -137,8 +137,8 @@ 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 as allies // Observers are considered allies to active combatants
return p == null || Stances[p] == Stance.Ally || p.Spectating; return p == null || Stances[p] == Stance.Ally || (p.Spectating && !NonCombatant);
} }
public void SetStance(Player target, Stance s) public void SetStance(Player target, Stance s)