From ca4b94703733883bf8df20f9ab7fb5b38f4af547 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Fri, 1 Aug 2014 22:47:18 +1200 Subject: [PATCH] Rename IAcceptInfiltrator to INotifyInfiltrated --- OpenRA.Game/Traits/TraitsInterfaces.cs | 4 ++-- OpenRA.Mods.RA/Activities/Infiltrate.cs | 4 ++-- OpenRA.Mods.RA/InfiltrateForCash.cs | 4 ++-- OpenRA.Mods.RA/InfiltrateForExploration.cs | 4 ++-- OpenRA.Mods.RA/InfiltrateForSupportPower.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 72b9a86610..990e85eb2b 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -81,9 +81,9 @@ namespace OpenRA.Traits public interface INotifyEffectiveOwnerChanged { void OnEffectiveOwnerChanged(Actor self, Player oldEffectiveOwner, Player newEffectiveOwner); } public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); } public interface INotifyHarvest { void Harvested(Actor self, ResourceType resource); } - public interface ISeedableResource { void Seed(Actor self); } + public interface INotifyInfiltrated { void Infiltrated(Actor self, Actor infiltrator); } - public interface IAcceptInfiltrator { void OnInfiltrate(Actor self, Actor infiltrator); } + public interface ISeedableResource { void Seed(Actor self); } public interface IDemolishableInfo { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); } public interface IDemolishable diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs index 3dc0e4c460..e991e3d1ca 100644 --- a/OpenRA.Mods.RA/Activities/Infiltrate.cs +++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs @@ -23,8 +23,8 @@ namespace OpenRA.Mods.RA.Activities if (IsCanceled || target.Type != TargetType.Actor || target.Actor.Owner == self.Owner) return NextActivity; - foreach (var t in target.Actor.TraitsImplementing()) - t.OnInfiltrate(target.Actor, self); + foreach (var t in target.Actor.TraitsImplementing()) + t.Infiltrated(target.Actor, self); self.Destroy(); diff --git a/OpenRA.Mods.RA/InfiltrateForCash.cs b/OpenRA.Mods.RA/InfiltrateForCash.cs index 9fff6af29f..cdaca5db9c 100644 --- a/OpenRA.Mods.RA/InfiltrateForCash.cs +++ b/OpenRA.Mods.RA/InfiltrateForCash.cs @@ -24,13 +24,13 @@ namespace OpenRA.Mods.RA public object Create(ActorInitializer init) { return new InfiltrateForCash(this); } } - class InfiltrateForCash : IAcceptInfiltrator + class InfiltrateForCash : INotifyInfiltrated { readonly InfiltrateForCashInfo info; public InfiltrateForCash(InfiltrateForCashInfo info) { this.info = info; } - public void OnInfiltrate(Actor self, Actor infiltrator) + public void Infiltrated(Actor self, Actor infiltrator) { var targetResources = self.Owner.PlayerActor.Trait(); var spyResources = infiltrator.Owner.PlayerActor.Trait(); diff --git a/OpenRA.Mods.RA/InfiltrateForExploration.cs b/OpenRA.Mods.RA/InfiltrateForExploration.cs index a8d0593720..ec0a02adbf 100644 --- a/OpenRA.Mods.RA/InfiltrateForExploration.cs +++ b/OpenRA.Mods.RA/InfiltrateForExploration.cs @@ -14,9 +14,9 @@ namespace OpenRA.Mods.RA { class InfiltrateForExplorationInfo : TraitInfo { } - class InfiltrateForExploration : IAcceptInfiltrator + class InfiltrateForExploration : INotifyInfiltrated { - public void OnInfiltrate(Actor self, Actor infiltrator) + public void Infiltrated(Actor self, Actor infiltrator) { // Steal and reset the owners exploration infiltrator.Owner.Shroud.Explore(self.Owner.Shroud); diff --git a/OpenRA.Mods.RA/InfiltrateForSupportPower.cs b/OpenRA.Mods.RA/InfiltrateForSupportPower.cs index fbf3b9a96e..6b6b7c80d4 100644 --- a/OpenRA.Mods.RA/InfiltrateForSupportPower.cs +++ b/OpenRA.Mods.RA/InfiltrateForSupportPower.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA public object Create(ActorInitializer init) { return new InfiltrateForSupportPower(this); } } - class InfiltrateForSupportPower : IAcceptInfiltrator + class InfiltrateForSupportPower : INotifyInfiltrated { readonly InfiltrateForSupportPowerInfo info; @@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA this.info = info; } - public void OnInfiltrate(Actor self, Actor infiltrator) + public void Infiltrated(Actor self, Actor infiltrator) { infiltrator.World.AddFrameEndTask(w => w.CreateActor(info.Proxy, new TypeDictionary {