From f47c2a678caf2903093c68c91b1efc2b39ab4f42 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 6 Apr 2011 17:06:07 +1200 Subject: [PATCH] remove some unnecessary semantics-muddying --- OpenRA.Game/Actor.cs | 7 ------- OpenRA.Mods.RA/AttackBase.cs | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 08c5e350b7..4e01649278 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -121,13 +121,6 @@ namespace OpenRA public bool IsInWorld { get; internal set; } - public void QueueActivity( bool queued, IActivity nextActivity ) - { - if( !queued ) - CancelActivity(); - QueueActivity( nextActivity ); - } - public void QueueActivity( IActivity nextActivity ) { if( currentActivity == null ) diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs index 71fd41e5ef..45af0e8376 100644 --- a/OpenRA.Mods.RA/AttackBase.cs +++ b/OpenRA.Mods.RA/AttackBase.cs @@ -182,7 +182,8 @@ namespace OpenRA.Mods.RA public void AttackTarget( Target target, bool queued, bool allowMove ) { if( !target.IsValid ) return; - self.QueueActivity(queued, GetAttackActivity(self, target, allowMove)); + if (!queued) self.CancelActivity(); + self.QueueActivity(GetAttackActivity(self, target, allowMove)); } class AttackOrderTargeter : IOrderTargeter