From 5070a81db4fe24af0dfb9af8f25a0752327efe55 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 30 Nov 2010 11:11:14 +1300 Subject: [PATCH] Move CancelableActivity into the Activities namespace. Remove the Idle activity. --- OpenRA.Game/Actor.cs | 11 ++++------- OpenRA.Game/OpenRA.Game.csproj | 1 - .../Traits/Activities/CancelableActivity.cs | 2 +- OpenRA.Game/Traits/Activities/Idle.cs | 17 ----------------- OpenRA.Mods.RA/Activities/CaptureBuilding.cs | 1 + OpenRA.Mods.RA/Activities/Demolish.cs | 1 + OpenRA.Mods.RA/Activities/EnterTransport.cs | 1 + OpenRA.Mods.RA/Activities/Infiltrate.cs | 1 + OpenRA.Mods.RA/Activities/Leap.cs | 3 ++- OpenRA.Mods.RA/Activities/Rearm.cs | 1 + OpenRA.Mods.RA/Activities/RemoveSelf.cs | 1 + OpenRA.Mods.RA/Activities/Repair.cs | 1 + OpenRA.Mods.RA/Activities/RepairBuilding.cs | 1 + OpenRA.Mods.RA/Activities/Teleport.cs | 1 + OpenRA.Mods.RA/Activities/Transform.cs | 1 + OpenRA.Mods.RA/Activities/Turn.cs | 1 + OpenRA.Mods.RA/Activities/Wait.cs | 1 + OpenRA.Mods.RA/Air/FallsToEarth.cs | 1 + OpenRA.Mods.RA/Air/Fly.cs | 1 + OpenRA.Mods.RA/Air/FlyAttack.cs | 1 + OpenRA.Mods.RA/Air/FlyTimed.cs | 1 + OpenRA.Mods.RA/Air/HeliAttack.cs | 1 + OpenRA.Mods.RA/Air/HeliFly.cs | 1 + OpenRA.Mods.RA/Air/HeliLand.cs | 1 + OpenRA.Mods.RA/Air/Land.cs | 1 + OpenRA.Mods.RA/Air/ReturnToBase.cs | 1 + OpenRA.Mods.RA/AttackMove.cs | 1 + OpenRA.Mods.RA/AttackOmni.cs | 1 + OpenRA.Mods.RA/AttackTesla.cs | 1 + OpenRA.Mods.RA/AttackTurreted.cs | 1 + 30 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 OpenRA.Game/Traits/Activities/Idle.cs diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 84b4a7a968..571a1a919a 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -68,10 +68,7 @@ namespace OpenRA public void Tick() { - if (currentActivity == null) - currentActivity = new Idle(); - - if (currentActivity is Idle) + if (currentActivity == null) foreach (var ni in TraitsImplementing()) ni.TickIdle(this); @@ -80,7 +77,7 @@ namespace OpenRA public bool IsIdle { - get { return currentActivity is Idle; } + get { return currentActivity == null; } } OpenRA.FileFormats.Lazy Size; @@ -121,7 +118,7 @@ namespace OpenRA public void QueueActivity( IActivity nextActivity ) { - if( currentActivity is Idle ) + if( currentActivity == null ) currentActivity = nextActivity; else currentActivity.Queue( nextActivity ); @@ -129,7 +126,7 @@ namespace OpenRA public void CancelActivity() { - if( !(currentActivity is Idle) ) + if( currentActivity != null ) currentActivity.Cancel( this ); } diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 9bb1d91a3b..58c9a9b3c9 100755 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -118,7 +118,6 @@ - diff --git a/OpenRA.Game/Traits/Activities/CancelableActivity.cs b/OpenRA.Game/Traits/Activities/CancelableActivity.cs index bded180ac1..da392c5eef 100755 --- a/OpenRA.Game/Traits/Activities/CancelableActivity.cs +++ b/OpenRA.Game/Traits/Activities/CancelableActivity.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace OpenRA.Traits +namespace OpenRA.Traits.Activities { public abstract class CancelableActivity : IActivity { diff --git a/OpenRA.Game/Traits/Activities/Idle.cs b/OpenRA.Game/Traits/Activities/Idle.cs deleted file mode 100644 index 137060f786..0000000000 --- a/OpenRA.Game/Traits/Activities/Idle.cs +++ /dev/null @@ -1,17 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2010 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see LICENSE. - */ -#endregion - -namespace OpenRA.Traits.Activities -{ - public class Idle : CancelableActivity - { - public override IActivity Tick(Actor self) { return NextActivity ?? this; } - } -} diff --git a/OpenRA.Mods.RA/Activities/CaptureBuilding.cs b/OpenRA.Mods.RA/Activities/CaptureBuilding.cs index 893d315cc2..419f0ff204 100644 --- a/OpenRA.Mods.RA/Activities/CaptureBuilding.cs +++ b/OpenRA.Mods.RA/Activities/CaptureBuilding.cs @@ -10,6 +10,7 @@ using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Demolish.cs b/OpenRA.Mods.RA/Activities/Demolish.cs index e65744eff8..7330500da1 100644 --- a/OpenRA.Mods.RA/Activities/Demolish.cs +++ b/OpenRA.Mods.RA/Activities/Demolish.cs @@ -11,6 +11,7 @@ using System.Linq; using OpenRA.Effects; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/EnterTransport.cs b/OpenRA.Mods.RA/Activities/EnterTransport.cs index 0ac42bde6f..aa5093d58c 100644 --- a/OpenRA.Mods.RA/Activities/EnterTransport.cs +++ b/OpenRA.Mods.RA/Activities/EnterTransport.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs index 2680f54c3f..21b34ec97d 100644 --- a/OpenRA.Mods.RA/Activities/Infiltrate.cs +++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs @@ -10,6 +10,7 @@ using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Leap.cs b/OpenRA.Mods.RA/Activities/Leap.cs index 6412211868..0b485c5da1 100644 --- a/OpenRA.Mods.RA/Activities/Leap.cs +++ b/OpenRA.Mods.RA/Activities/Leap.cs @@ -10,8 +10,9 @@ using System.Linq; using OpenRA.Mods.RA.Render; -using OpenRA.Traits; using OpenRA.Mods.RA.Move; +using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs index 71f5040e63..a6ed3a3bb9 100644 --- a/OpenRA.Mods.RA/Activities/Rearm.cs +++ b/OpenRA.Mods.RA/Activities/Rearm.cs @@ -11,6 +11,7 @@ using System.Linq; using OpenRA.Mods.RA.Render; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/RemoveSelf.cs b/OpenRA.Mods.RA/Activities/RemoveSelf.cs index 8496b81f46..3091ba2017 100755 --- a/OpenRA.Mods.RA/Activities/RemoveSelf.cs +++ b/OpenRA.Mods.RA/Activities/RemoveSelf.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs index b7058fbac2..d1ed98bbca 100644 --- a/OpenRA.Mods.RA/Activities/Repair.cs +++ b/OpenRA.Mods.RA/Activities/Repair.cs @@ -11,6 +11,7 @@ using System; using OpenRA.Mods.RA.Render; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/RepairBuilding.cs b/OpenRA.Mods.RA/Activities/RepairBuilding.cs index b02c8e5801..0ce0c28286 100644 --- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs +++ b/OpenRA.Mods.RA/Activities/RepairBuilding.cs @@ -10,6 +10,7 @@ using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs index b31610583d..c029d82001 100755 --- a/OpenRA.Mods.RA/Activities/Teleport.cs +++ b/OpenRA.Mods.RA/Activities/Teleport.cs @@ -10,6 +10,7 @@ using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Transform.cs b/OpenRA.Mods.RA/Activities/Transform.cs index 08925f8e5c..5d4a15a458 100644 --- a/OpenRA.Mods.RA/Activities/Transform.cs +++ b/OpenRA.Mods.RA/Activities/Transform.cs @@ -12,6 +12,7 @@ using OpenRA.FileFormats; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Render; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Turn.cs b/OpenRA.Mods.RA/Activities/Turn.cs index f1d175a87a..fecc089fcb 100755 --- a/OpenRA.Mods.RA/Activities/Turn.cs +++ b/OpenRA.Mods.RA/Activities/Turn.cs @@ -10,6 +10,7 @@ using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Wait.cs b/OpenRA.Mods.RA/Activities/Wait.cs index bab4f72a26..b5e75c44b5 100644 --- a/OpenRA.Mods.RA/Activities/Wait.cs +++ b/OpenRA.Mods.RA/Activities/Wait.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Air/FallsToEarth.cs b/OpenRA.Mods.RA/Air/FallsToEarth.cs index 9a8a0f9509..2c63683502 100755 --- a/OpenRA.Mods.RA/Air/FallsToEarth.cs +++ b/OpenRA.Mods.RA/Air/FallsToEarth.cs @@ -10,6 +10,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/Fly.cs b/OpenRA.Mods.RA/Air/Fly.cs index b3d16d02c1..c9c8328923 100755 --- a/OpenRA.Mods.RA/Air/Fly.cs +++ b/OpenRA.Mods.RA/Air/Fly.cs @@ -11,6 +11,7 @@ using System; using System.Collections.Generic; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/FlyAttack.cs b/OpenRA.Mods.RA/Air/FlyAttack.cs index ef1aaeeeb0..ea36e5a074 100755 --- a/OpenRA.Mods.RA/Air/FlyAttack.cs +++ b/OpenRA.Mods.RA/Air/FlyAttack.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/FlyTimed.cs b/OpenRA.Mods.RA/Air/FlyTimed.cs index 2f715531da..366d2a2888 100755 --- a/OpenRA.Mods.RA/Air/FlyTimed.cs +++ b/OpenRA.Mods.RA/Air/FlyTimed.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/HeliAttack.cs b/OpenRA.Mods.RA/Air/HeliAttack.cs index db1c84f5c7..93b8b57d1d 100755 --- a/OpenRA.Mods.RA/Air/HeliAttack.cs +++ b/OpenRA.Mods.RA/Air/HeliAttack.cs @@ -11,6 +11,7 @@ using System; using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/HeliFly.cs b/OpenRA.Mods.RA/Air/HeliFly.cs index a36e3ad5b0..6051b78152 100755 --- a/OpenRA.Mods.RA/Air/HeliFly.cs +++ b/OpenRA.Mods.RA/Air/HeliFly.cs @@ -11,6 +11,7 @@ using System; using System.Collections.Generic; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/HeliLand.cs b/OpenRA.Mods.RA/Air/HeliLand.cs index b252cad056..892a91b17e 100755 --- a/OpenRA.Mods.RA/Air/HeliLand.cs +++ b/OpenRA.Mods.RA/Air/HeliLand.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/Land.cs b/OpenRA.Mods.RA/Air/Land.cs index f856539b57..c72b661bd1 100755 --- a/OpenRA.Mods.RA/Air/Land.cs +++ b/OpenRA.Mods.RA/Air/Land.cs @@ -11,6 +11,7 @@ using System; using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/Air/ReturnToBase.cs b/OpenRA.Mods.RA/Air/ReturnToBase.cs index 61c94a0111..5f27b1188f 100755 --- a/OpenRA.Mods.RA/Air/ReturnToBase.cs +++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs @@ -11,6 +11,7 @@ using System; using System.Linq; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA.Air { diff --git a/OpenRA.Mods.RA/AttackMove.cs b/OpenRA.Mods.RA/AttackMove.cs index 02c4b1b3f1..f4b85f5aab 100644 --- a/OpenRA.Mods.RA/AttackMove.cs +++ b/OpenRA.Mods.RA/AttackMove.cs @@ -12,6 +12,7 @@ using System.Drawing; using OpenRA.Effects; using OpenRA.Mods.RA.Move; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/AttackOmni.cs b/OpenRA.Mods.RA/AttackOmni.cs index 7a7aa3c443..8c5497c423 100644 --- a/OpenRA.Mods.RA/AttackOmni.cs +++ b/OpenRA.Mods.RA/AttackOmni.cs @@ -10,6 +10,7 @@ using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/AttackTesla.cs b/OpenRA.Mods.RA/AttackTesla.cs index 4244c8d933..54111076fa 100644 --- a/OpenRA.Mods.RA/AttackTesla.cs +++ b/OpenRA.Mods.RA/AttackTesla.cs @@ -11,6 +11,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Render; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/AttackTurreted.cs b/OpenRA.Mods.RA/AttackTurreted.cs index cfaf5e9b81..554efe47cc 100644 --- a/OpenRA.Mods.RA/AttackTurreted.cs +++ b/OpenRA.Mods.RA/AttackTurreted.cs @@ -14,6 +14,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Move; using OpenRA.Traits; +using OpenRA.Traits.Activities; namespace OpenRA.Mods.RA {