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

Merge pull request #8699 from deniz1a/disguise-owner

Browse Source 
Shows real owner of disguised units to allies.
This commit is contained in:
Pavel Penev
2015-08-30 14:32:34 +03:00
parent 838faa4ae3 1a968588b6
commit 5e55cef02c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Traits/Disguise.cs
View File

@@ -49,10 +49,10 @@ namespace OpenRA.Mods.RA.Traits
{ {
get get
{ {
if (disguise.Disguised) if (!disguise.Disguised || self.Owner.IsAlliedWith(self.World.RenderPlayer))
return self.Owner == self.World.LocalPlayer ? self.Owner : disguise.AsPlayer; return self.Owner;
return self.Owner; return disguise.AsPlayer;
} }
} }
} }
@@ -135,8 +135,8 @@ namespace OpenRA.Mods.RA.Traits
if (target != null) if (target != null)
{ {
// Take the image of the target's disguise, if it exist. // Take the image of the target's disguise, if it exists.
// E.g., SpyA is disguised as a dog. SpyB then targets SpyA. We should use the dog image. // E.g., SpyA is disguised as a rifle infantry. SpyB then targets SpyA. We should use the rifle infantry image.
var targetDisguise = target.TraitOrDefault<Disguise>(); var targetDisguise = target.TraitOrDefault<Disguise>();
if (targetDisguise != null && targetDisguise.Disguised) if (targetDisguise != null && targetDisguise.Disguised)
{ {