From 30e2b69dba734bfa043dc64b8d3fece64dc78574 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Tue, 16 Jul 2019 09:16:32 +0300 Subject: [PATCH] Fix several traits missing OrderString checks for VoicePhraseForOrder --- OpenRA.Mods.Cnc/Traits/MadTank.cs | 3 +++ OpenRA.Mods.Common/Traits/DeliversCash.cs | 3 +++ OpenRA.Mods.Common/Traits/DeliversExperience.cs | 3 +++ 3 files changed, 9 insertions(+) diff --git a/OpenRA.Mods.Cnc/Traits/MadTank.cs b/OpenRA.Mods.Cnc/Traits/MadTank.cs index 598d32e92c..a86a66cd47 100644 --- a/OpenRA.Mods.Cnc/Traits/MadTank.cs +++ b/OpenRA.Mods.Cnc/Traits/MadTank.cs @@ -156,6 +156,9 @@ namespace OpenRA.Mods.Cnc.Traits string IOrderVoice.VoicePhraseForOrder(Actor self, Order order) { + if (order.OrderString != "DetonateAttack" && order.OrderString != "Detonate") + return null; + return info.Voice; } diff --git a/OpenRA.Mods.Common/Traits/DeliversCash.cs b/OpenRA.Mods.Common/Traits/DeliversCash.cs index 9474b44a47..ea2c05b34e 100644 --- a/OpenRA.Mods.Common/Traits/DeliversCash.cs +++ b/OpenRA.Mods.Common/Traits/DeliversCash.cs @@ -62,6 +62,9 @@ namespace OpenRA.Mods.Common.Traits public string VoicePhraseForOrder(Actor self, Order order) { + if (order.OrderString != "DeliverCash") + return null; + return info.Voice; } diff --git a/OpenRA.Mods.Common/Traits/DeliversExperience.cs b/OpenRA.Mods.Common/Traits/DeliversExperience.cs index 02c9a9822c..60be9364fb 100644 --- a/OpenRA.Mods.Common/Traits/DeliversExperience.cs +++ b/OpenRA.Mods.Common/Traits/DeliversExperience.cs @@ -64,6 +64,9 @@ namespace OpenRA.Mods.Common.Traits public string VoicePhraseForOrder(Actor self, Order order) { + if (order.OrderString != "DeliverExperience") + return null; + return info.Voice; }