diff --git a/OpenRA.Game/Traits/SupportPowers/SupportPower.cs b/OpenRA.Game/Traits/SupportPowers/SupportPower.cs index 162841947f..6954b54ea9 100644 --- a/OpenRA.Game/Traits/SupportPowers/SupportPower.cs +++ b/OpenRA.Game/Traits/SupportPowers/SupportPower.cs @@ -86,6 +86,7 @@ namespace OpenRA.Traits if (RemainingTime > 0) --RemainingTime; if (!notifiedCharging) { + Sound.PlayToPlayer(Owner, Info.BeginChargeSound); OnBeginCharging(); notifiedCharging = true; } @@ -94,6 +95,7 @@ namespace OpenRA.Traits if (RemainingTime == 0 && !notifiedReady) { + Sound.PlayToPlayer(Owner, Info.EndChargeSound); OnFinishCharging(); notifiedReady = true; } @@ -150,6 +152,7 @@ namespace OpenRA.Traits return; } + Sound.PlayToPlayer(Owner, Info.SelectTargetSound); OnActivate(); } } diff --git a/OpenRA.Mods.Cnc/AirstrikePower.cs b/OpenRA.Mods.Cnc/AirstrikePower.cs index bc5cfdae4a..ca1582b479 100644 --- a/OpenRA.Mods.Cnc/AirstrikePower.cs +++ b/OpenRA.Mods.Cnc/AirstrikePower.cs @@ -37,11 +37,8 @@ namespace OpenRA.Mods.Cnc protected override void OnActivate() { Game.controller.orderGenerator = new GenericSelectTarget(Owner.PlayerActor, "Airstrike", "ability"); - Sound.Play(Info.SelectTargetSound); } - protected override void OnFinishCharging() { Sound.PlayToPlayer(Owner, Info.EndChargeSound); } - public void ResolveOrder(Actor self, Order order) { if (order.OrderString == "Airstrike") diff --git a/OpenRA.Mods.Cnc/IonCannonPower.cs b/OpenRA.Mods.Cnc/IonCannonPower.cs index 9cb198d6ab..9cc1aa2cb1 100644 --- a/OpenRA.Mods.Cnc/IonCannonPower.cs +++ b/OpenRA.Mods.Cnc/IonCannonPower.cs @@ -52,14 +52,10 @@ namespace OpenRA.Mods.Cnc } } - protected override void OnBeginCharging() { Sound.PlayToPlayer(Owner, Info.BeginChargeSound); } - protected override void OnFinishCharging() { Sound.PlayToPlayer(Owner, Info.EndChargeSound); } - protected override void OnActivate() { Game.controller.orderGenerator = new GenericSelectTargetWithBuilding(Owner.PlayerActor, "IonCannon", "ability"); - Sound.PlayToPlayer(Owner, Info.SelectTargetSound); } } diff --git a/OpenRA.Mods.RA/ParatroopersPower.cs b/OpenRA.Mods.RA/ParatroopersPower.cs index 90ed43e5e5..f922d88c03 100644 --- a/OpenRA.Mods.RA/ParatroopersPower.cs +++ b/OpenRA.Mods.RA/ParatroopersPower.cs @@ -35,13 +35,10 @@ namespace OpenRA.Mods.RA { public ParatroopersPower(Actor self, ParatroopersPowerInfo info) : base(self, info) { } - protected override void OnFinishCharging() { Sound.PlayToPlayer(Owner, Info.EndChargeSound); } - protected override void OnActivate() { Game.controller.orderGenerator = new GenericSelectTarget( Owner.PlayerActor, "ParatroopersActivate", "ability" ); - Sound.PlayToPlayer(Owner, Info.SelectTargetSound); } public void ResolveOrder(Actor self, Order order) diff --git a/OpenRA.Mods.RA/SupportPowers/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs index 2e5ebcd273..a5156f8749 100755 --- a/OpenRA.Mods.RA/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/NukePower.cs @@ -36,13 +36,10 @@ namespace OpenRA.Mods.RA.SupportPowers { public NukePower(Actor self, NukePowerInfo info) : base(self, info) { } - protected override void OnBeginCharging() { Sound.PlayToPlayer(Owner, Info.BeginChargeSound); } - protected override void OnFinishCharging() { Sound.PlayToPlayer(Owner, Info.EndChargeSound); } protected override void OnActivate() { Game.controller.orderGenerator = new GenericSelectTargetWithBuilding(Owner.PlayerActor, "NuclearMissile", "nuke"); - Sound.PlayToPlayer(Owner, Info.SelectTargetSound); } public void ResolveOrder(Actor self, Order order)