From c775b5ba68af05b407d6411bbcde503f3aa93790 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 9 Apr 2011 10:32:36 +1200
Subject: [PATCH] Remove some dead code from UOG.

---
 OpenRA.Game/Orders/UnitOrderGenerator.cs | 94 ++++++------------------
 OpenRA.Game/Traits/TraitsInterfaces.cs   |  1 -
 2 files changed, 24 insertions(+), 71 deletions(-)

diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index 709ae26850..df0c1bfe04 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -19,86 +19,41 @@ namespace OpenRA.Orders
 	{
 		public IEnumerable<Order> Order( World world, int2 xy, MouseInput mi )
 		{
-		    var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                var customOrders = custom.Order(world, xy, mi);
 
-                foreach (var o in customOrders)
-                    yield return o;
-            }
-            else
-            {
-                var underCursor = world.FindUnitsAtMouse(mi.Location)
-                    .Where(a => a.HasTrait<ITargetable>())
-                    .OrderByDescending(
-                        a =>
-                        a.Info.Traits.Contains<SelectableInfo>()
-                            ? a.Info.Traits.Get<SelectableInfo>().Priority
-                            : int.MinValue)
-                    .FirstOrDefault();
+            var underCursor = world.FindUnitsAtMouse(mi.Location)
+                .Where(a => a.HasTrait<ITargetable>())
+                .OrderByDescending(
+                    a =>
+                    a.Info.Traits.Contains<SelectableInfo>()
+                        ? a.Info.Traits.Get<SelectableInfo>().Priority
+                        : int.MinValue)
+                .FirstOrDefault();
 
-                var orders = world.Selection.Actors
-                    .Select(a => OrderForUnit(a, xy, mi, underCursor))
-                    .Where(o => o != null)
-                    .ToArray();
+            var orders = world.Selection.Actors
+                .Select(a => OrderForUnit(a, xy, mi, underCursor))
+                .Where(o => o != null)
+                .ToArray();
 
-                var actorsInvolved = orders.Select(o => o.self).Distinct();
-				if (actorsInvolved.Any())
-					yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
-					{
-						TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
-					};
-                       
+            var actorsInvolved = orders.Select(o => o.self).Distinct();
+			if (actorsInvolved.Any())
+				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
+				{
+					TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
+				};
+                   
 
-                foreach (var o in orders)
-                    yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));
-            }
+            foreach (var o in orders)
+                yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));
 		}
 
-		public void Tick( World world )
-        {
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                custom.Tick(world);
-            }
-		}
-
-		public void RenderBeforeWorld( WorldRenderer wr, World world )
-        {
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                custom.RenderBeforeWorld(wr, world);
-                return;
-            }
-
-			Game.Renderer.Flush();
-		}
-
-		public void RenderAfterWorld( WorldRenderer wr, World world )
-        {
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-                custom.RenderAfterWorld(wr, world);
-                return;
-            }
-			
-			Game.Renderer.Flush();
-		}
+		public void Tick( World world ) { }
+		public void RenderBeforeWorld( WorldRenderer wr, World world ) { }
+		public void RenderAfterWorld( WorldRenderer wr, World world ) { }
 
 		public string GetCursor( World world, int2 xy, MouseInput mi )
 		{
 			bool useSelect = false;
 
-            var custom = world.WorldActor.TraitOrDefault<ICustomUnitOrderGenerator>();
-            if (custom != null)
-            {
-               return custom.GetCursor(world, xy, mi);
-            }
-
 			var underCursor = world.FindUnitsAtMouse(mi.Location)
 				.Where(a => a.HasTrait<ITargetable>())
 				.OrderByDescending(a => a.Info.Traits.Contains<SelectableInfo>() ? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
@@ -124,7 +79,6 @@ namespace OpenRA.Orders
 			if (self.Owner != self.World.LocalPlayer)
 				return null;
 
-
 			if (self.Destroyed)
 				return null;
 
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 39e194a01b..af3e1e0bc7 100755
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -57,7 +57,6 @@ namespace OpenRA.Traits
     public interface IValidateOrder { bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order); }
     public interface IOrderCursor { string CursorForOrder(Actor self, Order order); }
     public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
-    public interface ICustomUnitOrderGenerator : IOrderGenerator { };
     public interface INotifySold { void Selling(Actor self); void Sold(Actor self); }
     public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
     public interface INotifyAppliedDamage { void AppliedDamage(Actor self, Actor damaged, AttackInfo e); }