From 672172d1f122061267bb6c8fa2254a48d99aa755 Mon Sep 17 00:00:00 2001 From: abc013 Date: Fri, 30 Oct 2020 16:28:38 +0100 Subject: [PATCH] Add missing PlayNotification calls to SelectTarget. --- OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs | 1 - OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs | 1 - .../Traits/SupportPowers/AirstrikePower.cs | 6 ------ .../Traits/SupportPowers/GrantExternalConditionPower.cs | 1 - OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs | 3 --- .../Traits/SupportPowers/ParatroopersPower.cs | 6 ------ OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs | 3 --- .../Traits/SupportPowers/SupportPowerManager.cs | 9 ++++++++- 8 files changed, 8 insertions(+), 22 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs index 81b98dcdae..6c4c3c16b6 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs @@ -50,7 +50,6 @@ namespace OpenRA.Mods.Cnc.Traits public override void SelectTarget(Actor self, string order, SupportPowerManager manager) { - Game.Sound.PlayToPlayer(SoundType.UI, manager.Self.Owner, Info.SelectTargetSound); self.World.OrderGenerator = new SelectAttackPowerTarget(self, order, manager, info.Cursor, MouseButton.Left, attack); } diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs index db8a113213..4c8b33e577 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs @@ -74,7 +74,6 @@ namespace OpenRA.Mods.Cnc.Traits public override void SelectTarget(Actor self, string order, SupportPowerManager manager) { - Game.Sound.PlayToPlayer(SoundType.UI, manager.Self.Owner, Info.SelectTargetSound); self.World.OrderGenerator = new SelectChronoshiftTarget(Self.World, order, manager, this); } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs index c1e5eafb1c..06da215ed7 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs @@ -64,13 +64,7 @@ namespace OpenRA.Mods.Common.Traits public override void SelectTarget(Actor self, string order, SupportPowerManager manager) { if (info.UseDirectionalTarget) - { - Game.Sound.PlayToPlayer(SoundType.UI, manager.Self.Owner, Info.SelectTargetSound); - Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", - Info.SelectTargetSpeechNotification, self.Owner.Faction.InternalName); - self.World.OrderGenerator = new SelectDirectionalTarget(self.World, order, manager, Info.Cursor, info.DirectionArrowAnimation, info.DirectionArrowPalette); - } else base.SelectTarget(self, order, manager); } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs index 85e4539318..c1eaf62b3f 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs @@ -67,7 +67,6 @@ namespace OpenRA.Mods.Common.Traits public override void SelectTarget(Actor self, string order, SupportPowerManager manager) { - Game.Sound.PlayToPlayer(SoundType.World, manager.Self.Owner, Info.SelectTargetSound); self.World.OrderGenerator = new SelectConditionTarget(Self.World, order, manager, this); } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs index 0ed96fc8ad..5aa137fb50 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs @@ -211,9 +211,6 @@ namespace OpenRA.Mods.Common.Traits public override void SelectTarget(Actor self, string order, SupportPowerManager manager) { - Game.Sound.PlayToPlayer(SoundType.UI, manager.Self.Owner, Info.SelectTargetSound); - Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", - Info.SelectTargetSpeechNotification, self.Owner.Faction.InternalName); self.World.OrderGenerator = new SelectNukePowerTarget(order, manager, info, MouseButton.Left); } } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs index 9b11b6c8c5..63986f0804 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs @@ -78,13 +78,7 @@ namespace OpenRA.Mods.Common.Traits public override void SelectTarget(Actor self, string order, SupportPowerManager manager) { if (info.UseDirectionalTarget) - { - Game.Sound.PlayToPlayer(SoundType.UI, manager.Self.Owner, Info.SelectTargetSound); - Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", - Info.SelectTargetSpeechNotification, self.Owner.Faction.InternalName); - self.World.OrderGenerator = new SelectDirectionalTarget(self.World, order, manager, Info.Cursor, info.DirectionArrowAnimation, info.DirectionArrowPalette); - } else base.SelectTarget(self, order, manager); } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs index e9b44b2bed..b1e11b57b0 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs @@ -160,9 +160,6 @@ namespace OpenRA.Mods.Common.Traits public virtual void SelectTarget(Actor self, string order, SupportPowerManager manager) { - Game.Sound.PlayToPlayer(SoundType.UI, manager.Self.Owner, Info.SelectTargetSound); - Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", - Info.SelectTargetSpeechNotification, self.Owner.Faction.InternalName); self.World.OrderGenerator = new SelectGenericPowerTarget(order, manager, info.Cursor, MouseButton.Left); } diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs index fa3b98b8d4..d7ad4c4e77 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs @@ -228,7 +228,14 @@ namespace OpenRA.Mods.Common.Traits var power = Instances.FirstOrDefault(i => !i.IsTraitPaused); - power?.SelectTarget(power.Self, Key, Manager); + if (power == null) + return; + + Game.Sound.PlayToPlayer(SoundType.UI, Manager.Self.Owner, Info.SelectTargetSound); + Game.Sound.PlayNotification(power.Self.World.Map.Rules, power.Self.Owner, "Speech", + Info.SelectTargetSpeechNotification, power.Self.Owner.Faction.InternalName); + + power.SelectTarget(power.Self, Key, Manager); } public virtual void Activate(Order order)