From a1f05fd017f10e55725ce57a91c79be20601baaf Mon Sep 17 00:00:00 2001 From: Curtis Shmyr Date: Sun, 14 Jul 2013 11:53:15 -0600 Subject: [PATCH] Remove unused interface INotifyOtherCaptured --- OpenRA.Game/Traits/TraitsInterfaces.cs | 1 - OpenRA.Mods.RA/Activities/CaptureActor.cs | 3 --- OpenRA.Mods.RA/Activities/LegacyCaptureActor.cs | 3 --- 3 files changed, 7 deletions(-) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 8bcda46358..56ec0c1f01 100755 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -73,7 +73,6 @@ namespace OpenRA.Traits public interface INotifyProduction { void UnitProduced(Actor self, Actor other, CPos exit); } public interface INotifyOwnerChanged { void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner); } public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); } - public interface INotifyOtherCaptured { void OnActorCaptured(Actor self, Actor captured, Actor captor, Player oldOwner, Player newOwner); } public interface INotifyHarvest { void Harvested(Actor self, ResourceType resource); } public interface IAcceptInfiltrator { void OnInfiltrate(Actor self, Actor infiltrator); } diff --git a/OpenRA.Mods.RA/Activities/CaptureActor.cs b/OpenRA.Mods.RA/Activities/CaptureActor.cs index 67666faa0f..91af78a7aa 100644 --- a/OpenRA.Mods.RA/Activities/CaptureActor.cs +++ b/OpenRA.Mods.RA/Activities/CaptureActor.cs @@ -68,9 +68,6 @@ namespace OpenRA.Mods.RA.Activities foreach (var t in target.Actor.TraitsImplementing()) t.OnCapture(target.Actor, self, oldOwner, self.Owner); - foreach (var t in self.World.ActorsWithTrait()) - t.Trait.OnActorCaptured(t.Actor, target.Actor, self, oldOwner, self.Owner); - capturable.EndCapture(); if (capturesInfo != null && capturesInfo.ConsumeActor) diff --git a/OpenRA.Mods.RA/Activities/LegacyCaptureActor.cs b/OpenRA.Mods.RA/Activities/LegacyCaptureActor.cs index 4557e9a9c0..83d8dbad8d 100644 --- a/OpenRA.Mods.RA/Activities/LegacyCaptureActor.cs +++ b/OpenRA.Mods.RA/Activities/LegacyCaptureActor.cs @@ -49,9 +49,6 @@ namespace OpenRA.Mods.RA.Activities foreach (var t in target.Actor.TraitsImplementing()) t.OnCapture(target.Actor, self, oldOwner, self.Owner); - foreach (var t in target.Actor.World.ActorsWithTrait()) - t.Trait.OnActorCaptured(t.Actor, target.Actor, self, oldOwner, self.Owner); - if (b != null && b.Locked) b.Unlock(); }