From 83afcc344822954a4e5789e30c8c92caa1694d79 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 7 Sep 2017 17:47:32 +0200 Subject: [PATCH] Some misc explicit interfaces Just a by-product from a previous commit, not meant to do anything specific other than bringing us a tiny step closer to requiring explicit implementations for these interfaces too, at some point. --- OpenRA.Mods.Common/Traits/AttackMove.cs | 2 +- OpenRA.Mods.Common/Traits/AutoTarget.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/AttackMove.cs b/OpenRA.Mods.Common/Traits/AttackMove.cs index 7a997c4e2f..ad8dac398f 100644 --- a/OpenRA.Mods.Common/Traits/AttackMove.cs +++ b/OpenRA.Mods.Common/Traits/AttackMove.cs @@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Traits assaultMoveToken = conditionManager.RevokeCondition(self, assaultMoveToken); } - public string VoicePhraseForOrder(Actor self, Order order) + string IOrderVoice.VoicePhraseForOrder(Actor self, Order order) { if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove") return info.Voice; diff --git a/OpenRA.Mods.Common/Traits/AutoTarget.cs b/OpenRA.Mods.Common/Traits/AutoTarget.cs index ed179ee14b..602a98e0b1 100644 --- a/OpenRA.Mods.Common/Traits/AutoTarget.cs +++ b/OpenRA.Mods.Common/Traits/AutoTarget.cs @@ -145,13 +145,13 @@ namespace OpenRA.Mods.Common.Traits ApplyStanceCondition(self); } - public void ResolveOrder(Actor self, Order order) + void IResolveOrder.ResolveOrder(Actor self, Order order) { if (order.OrderString == "SetUnitStance" && Info.EnableStances) SetStance(self, (UnitStance)order.ExtraData); } - public void Damaged(Actor self, AttackInfo e) + void INotifyDamage.Damaged(Actor self, AttackInfo e) { if (IsTraitDisabled || !self.IsIdle || Stance < UnitStance.ReturnFire) return; @@ -210,7 +210,7 @@ namespace OpenRA.Mods.Common.Traits return true; } - public void Tick(Actor self) + void ITick.Tick(Actor self) { if (IsTraitDisabled) return;