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

Fix EnemyWatcher's interaction with disguised actors

Browse Source
This commit is contained in:
penev92
2015-03-22 12:26:34 +02:00
parent 5de9e72707
commit 460d0b84a6
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs
View File

@@ -69,9 +69,8 @@ namespace OpenRA.Mods.Common.Traits
foreach (var actor in self.World.ActorsWithTrait<AnnounceOnSeen>()) foreach (var actor in self.World.ActorsWithTrait<AnnounceOnSeen>())
{ {
// We don't want notifications for allied actors // We don't want notifications for allied actors or actors disguised as such
if ((actor.Actor.EffectiveOwner != null && self.Owner.Stances[actor.Actor.EffectiveOwner.Owner] == Stance.Ally) if (actor.Actor.AppearsFriendlyTo(self))
|| self.Owner.Stances[actor.Actor.Owner] == Stance.Ally)
continue; continue;
if (actor.Actor.IsDead || !actor.Actor.IsInWorld) if (actor.Actor.IsDead || !actor.Actor.IsInWorld)

5
OpenRA.Mods.Common/Traits/Sound/AnnounceOnSeen.cs
View File

@@ -45,9 +45,8 @@ namespace OpenRA.Mods.Common.Traits
return; return;
// Hack to disable notifications for neutral actors so some custom maps don't need fixing // Hack to disable notifications for neutral actors so some custom maps don't need fixing
if (!Info.AnnounceNeutrals && // At this point it's either neutral or an enemy
((self.EffectiveOwner != null && discoverer.Stances[self.EffectiveOwner.Owner] != Stance.Enemy) if (!Info.AnnounceNeutrals && !self.AppearsHostileTo(discoverer.PlayerActor))
|| discoverer.Stances[self.Owner] != Stance.Enemy))
return; return;
// Audio notification // Audio notification