Create a PlayLaunchSounds method in SupportPower.cs

This commit is contained in:
abcdefg30
2016-09-06 14:08:08 +02:00
parent 08d84c5b90
commit 620e005cfd
4 changed files with 15 additions and 25 deletions

View File

@@ -92,15 +92,7 @@ namespace OpenRA.Mods.Common.Traits
public override void Activate(Actor self, Order order, SupportPowerManager manager)
{
base.Activate(self, order, manager);
var renderPlayer = self.World.RenderPlayer;
var isAllied = self.Owner.IsAlliedWith(renderPlayer);
Game.Sound.Play(isAllied ? Info.LaunchSound : Info.IncomingSound);
// IsAlliedWith returns true if renderPlayer is null, so we are safe here.
var toPlayer = isAllied ? renderPlayer ?? self.Owner : renderPlayer;
var speech = isAllied ? Info.LaunchSpeechNotification : Info.IncomingSpeechNotification;
Game.Sound.PlayNotification(self.World.Map.Rules, toPlayer, "Speech", speech, toPlayer.Faction.InternalName);
PlayLaunchSounds();
if (!string.IsNullOrEmpty(info.ActivationSequence))
{