epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some unnecessary semantics-muddying

Browse Source
This commit is contained in:
Chris Forbes
2011-04-06 17:06:07 +12:00
parent aba14eec23
commit f47c2a678c
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Actor.cs
View File

@@ -121,13 +121,6 @@ namespace OpenRA
public bool IsInWorld { get; internal set; } public bool IsInWorld { get; internal set; }
public void QueueActivity( bool queued, IActivity nextActivity )
{
if( !queued )
CancelActivity();
QueueActivity( nextActivity );
}
public void QueueActivity( IActivity nextActivity ) public void QueueActivity( IActivity nextActivity )
{ {
if( currentActivity == null ) if( currentActivity == null )

3
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -182,7 +182,8 @@ namespace OpenRA.Mods.RA
public void AttackTarget( Target target, bool queued, bool allowMove ) public void AttackTarget( Target target, bool queued, bool allowMove )
{ {
if( !target.IsValid ) return; if( !target.IsValid ) return;
self.QueueActivity(queued, GetAttackActivity(self, target, allowMove)); if (!queued) self.CancelActivity();
self.QueueActivity(GetAttackActivity(self, target, allowMove));
} }
class AttackOrderTargeter : IOrderTargeter class AttackOrderTargeter : IOrderTargeter