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

Reduce the usage of different ways to determine the new owner

Browse Source 
We don't need the LocalPlayer check if we only play the sound to the new owner,
and captor.Owner == newOwner in this case.
This commit is contained in:
abcdefg30
2016-04-17 15:26:53 +02:00
parent bd28445754
commit c8cfb10ab1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Sound/CaptureNotification.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits.Sound
public class CaptureNotification : INotifyCapture public class CaptureNotification : INotifyCapture
{ {
CaptureNotificationInfo info; readonly CaptureNotificationInfo info;
public CaptureNotification(CaptureNotificationInfo info) public CaptureNotification(CaptureNotificationInfo info)
{ {
this.info = info; this.info = info;
@@ -31,11 +31,8 @@ namespace OpenRA.Mods.Common.Traits.Sound
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner) public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{ {
if (captor.World.LocalPlayer != captor.Owner)
return;
var faction = info.NewOwnerVoice ? newOwner.Faction.InternalName : oldOwner.Faction.InternalName; var faction = info.NewOwnerVoice ? newOwner.Faction.InternalName : oldOwner.Faction.InternalName;
Game.Sound.PlayNotification(self.World.Map.Rules, captor.World.LocalPlayer, "Speech", info.Notification, faction); Game.Sound.PlayNotification(self.World.Map.Rules, newOwner, "Speech", info.Notification, faction);
} }
} }
} }