Move CancelableActivity into the Activities namespace. Remove the Idle activity.

OpenRA.Game/Actor.cs

@@ -68,10 +68,7 @@ namespace OpenRA
 
 		public void Tick()
 		{
-			if (currentActivity == null)
+			if (currentActivity == null)
-				currentActivity = new Idle();
-			
-			if (currentActivity is Idle)
 				foreach (var ni in TraitsImplementing<INotifyIdle>())
 					ni.TickIdle(this);
 
@@ -80,7 +77,7 @@ namespace OpenRA
 
 		public bool IsIdle
 		{
-			get { return currentActivity is Idle; }
+			get { return currentActivity == null; }
 		}
 
         OpenRA.FileFormats.Lazy<float2> 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 );
 		}
 

OpenRA.Game/OpenRA.Game.csproj

@@ -118,7 +118,6 @@
     <Compile Include="Graphics\CursorSheetBuilder.cs" />
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
-    <Compile Include="Traits\Activities\Idle.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="Graphics\Sheet.cs" />

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
 	{

OpenRA.Game/Traits/Activities/Idle.cs

@@ -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; }
-	}
-}

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
 {

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
 {

OpenRA.Mods.RA/Activities/EnterTransport.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {

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
 {

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
 {

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
 {

OpenRA.Mods.RA/Activities/RemoveSelf.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {

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
 {

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
 {

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
 {

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
 {

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
 {

OpenRA.Mods.RA/Activities/Wait.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {

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
 {

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
 {

OpenRA.Mods.RA/Air/FlyAttack.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {

OpenRA.Mods.RA/Air/FlyTimed.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {

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
 {

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
 {

OpenRA.Mods.RA/Air/HeliLand.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {