From 820f67e46b691fce00047ff9632522f918bdd56c Mon Sep 17 00:00:00 2001
From: alzeih <alzeih@gmail.com>
Date: Tue, 5 Apr 2011 20:45:58 +1200
Subject: [PATCH] more for Activity

---
 .../Traits/Activities/CancelableActivity.cs   | 92 +++++++++----------
 OpenRA.Mods.RA/Air/FlyCircle.cs               | 64 ++++++-------
 2 files changed, 73 insertions(+), 83 deletions(-)

diff --git a/OpenRA.Game/Traits/Activities/CancelableActivity.cs b/OpenRA.Game/Traits/Activities/CancelableActivity.cs
index dcc431c3e6..0c394f3cd8 100755
--- a/OpenRA.Game/Traits/Activities/CancelableActivity.cs
+++ b/OpenRA.Game/Traits/Activities/CancelableActivity.cs
@@ -1,51 +1,41 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 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 COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OpenRA.Traits.Activities
-{
-	public class Activity
-	{
-		public Activity NextActivity { get; set; }
-		protected bool IsCanceled { get; private set; }
-
-		public virtual Activity Tick( Actor self )
-		{
-			return this;	
-		}
-		protected virtual bool OnCancel( Actor self ) { return true; }
-
-		public void Cancel( Actor self )
-		{
-			IsCanceled = OnCancel( self );
-			if( IsCanceled )
-				NextActivity = null;
-			else if (NextActivity != null)
-				NextActivity.Cancel( self );
-		}
-
-		public virtual void Queue( Activity activity )
-		{
-			if( NextActivity != null )
-				NextActivity.Queue( activity );
-			else
-				NextActivity = activity;
-		}
-
-		public virtual IEnumerable<Target> GetTargetQueue( Actor self )
-		{
-			yield break;
-		}
-	}
-}
\ No newline at end of file
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenRA.Traits.Activities
+{
+	public class Activity
+	{
+		public Activity NextActivity { get; set; }
+		protected bool IsCanceled { get; private set; }
+
+		public virtual Activity Tick( Actor self )
+		{
+			return this;	
+		}
+		protected virtual bool OnCancel( Actor self ) { return true; }
+
+		public virtual void Cancel( Actor self )
+		{
+			IsCanceled = OnCancel( self );
+			if( IsCanceled )
+				NextActivity = null;
+			else if (NextActivity != null)
+				NextActivity.Cancel( self );
+		}
+
+		public virtual void Queue( Activity activity )
+		{
+			if( NextActivity != null )
+				NextActivity.Queue( activity );
+			else
+				NextActivity = activity;
+		}
+
+		public virtual IEnumerable<Target> GetTargetQueue( Actor self )
+		{
+			yield break;
+		}
+	}
+}
diff --git a/OpenRA.Mods.RA/Air/FlyCircle.cs b/OpenRA.Mods.RA/Air/FlyCircle.cs
index 4abe50ee4c..a37bd03c18 100644
--- a/OpenRA.Mods.RA/Air/FlyCircle.cs
+++ b/OpenRA.Mods.RA/Air/FlyCircle.cs
@@ -1,38 +1,38 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 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 COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-
-namespace OpenRA.Mods.RA.Air
-{
-    public class FlyCircle : Activity
-    {
-        public override Activity Tick(Actor self)
-        {
-            var cruiseAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
-
-            if (IsCanceled) return NextActivity;
-
-            var aircraft = self.Trait<Aircraft>();
-
-            var desiredFacing = aircraft.Facing + 64;   // we can't possibly turn this fast.
-            if (aircraft.Altitude == cruiseAltitude)
-                aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);
-
-            if (aircraft.Altitude < cruiseAltitude)
-                ++aircraft.Altitude;
-
-            FlyUtil.Fly(self, cruiseAltitude);
-            return this;
-        }
-    }
-}
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
+
+namespace OpenRA.Mods.RA.Air
+{
+    public class FlyCircle : Activity
+    {
+        public override Activity Tick(Actor self)
+        {
+            var cruiseAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
+
+            if (IsCanceled) return NextActivity;
+
+            var aircraft = self.Trait<Aircraft>();
+
+            var desiredFacing = aircraft.Facing + 64;   // we can't possibly turn this fast.
+            if (aircraft.Altitude == cruiseAltitude)
+                aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);
+
+            if (aircraft.Altitude < cruiseAltitude)
+                ++aircraft.Altitude;
+
+            FlyUtil.Fly(self, cruiseAltitude);
+            return this;
+        }
+    }
+}