From 398f02c5db1063b3ce8c034d652d6ea0b6df234a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 29 Jul 2015 17:45:30 +0200 Subject: [PATCH] Remove redundant ISync and ITick from Attack* traits ISync is implemented by AttackBase, so there's no need for other Attack traits to implement it again. AttackTurreted inherits AttackFollow, which already implements ITick. --- OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs | 2 +- OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs | 2 +- OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs | 2 +- OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs b/OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs index e93cf3e35b..9060034f8d 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new AttackCharge(init.Self, this); } } - class AttackCharge : AttackOmni, ITick, INotifyAttack, ISync + class AttackCharge : AttackOmni, ITick, INotifyAttack { readonly AttackChargeInfo info; diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs index 67fe6c2cb7..f3ecf7af04 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new AttackFollow(init.Self, this); } } - public class AttackFollow : AttackBase, ITick, INotifyOwnerChanged, ISync + public class AttackFollow : AttackBase, ITick, INotifyOwnerChanged { public Target Target { get; protected set; } diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs b/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs index 3bea50c018..10fc528170 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs @@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new AttackOmni(init.Self, this); } } - class AttackOmni : AttackBase, ISync + class AttackOmni : AttackBase { public AttackOmni(Actor self, AttackOmniInfo info) : base(self, info) { } diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs b/OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs index aca0f97111..c86cc3cdbb 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new AttackTurreted(init.Self, this); } } - public class AttackTurreted : AttackFollow, ITick, ISync + public class AttackTurreted : AttackFollow { protected Turreted[] turrets;