shuffling

OpenRa.Game/Chrome.cs

@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
-using IjwFramework.Collections;
 using IjwFramework.Types;
-using OpenRa.Game.Graphics;
-using OpenRa.Game.Support;
 using OpenRa.Game.GameRules;
-
+using OpenRa.Game.Graphics;
+using OpenRa.Game.Orders;
+using OpenRa.Game.Support;
 
 namespace OpenRa.Game
 {
@@ -363,7 +361,7 @@ namespace OpenRa.Game
 					if (producing.Done)
 					{
 						if (group == "Building" || group == "Defense")
-							Game.controller.orderGenerator = new PlaceBuilding(player.PlayerActor, item);
+							Game.controller.orderGenerator = new PlaceBuildingOrderGenerator(player.PlayerActor, item);
 						return;
 					}
 

OpenRa.Game/Controller.cs

@@ -5,6 +5,7 @@ using IjwFramework.Collections;
 using IjwFramework.Types;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Graphics;
+using OpenRa.Game.Orders;
 using OpenRa.Game.Traits;
 
 namespace OpenRa.Game
@@ -62,7 +63,7 @@ namespace OpenRa.Game
 
 			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
 			{
-				if (!(orderGenerator is PlaceBuilding))
+				if (!(orderGenerator is PlaceBuildingOrderGenerator))
 					dragStart = dragEnd = xy;
 				ApplyOrders(xy, mi);
 			}
@@ -72,7 +73,7 @@ namespace OpenRa.Game
 
 			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Up)
 			{
-				if (!(orderGenerator is PlaceBuilding))
+				if (!(orderGenerator is PlaceBuildingOrderGenerator))
 				{
 					var newSelection = Game.SelectActorsInBox(Game.CellSize * dragStart, Game.CellSize * xy);
 					CombineSelection(newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);

OpenRa.Game/Game.cs

@@ -6,6 +6,7 @@ using System.Net.Sockets;
 using OpenRa.FileFormats;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Graphics;
+using OpenRa.Game.Orders;
 using OpenRa.Game.Support;
 using OpenRa.Game.Traits;
 

OpenRa.Game/OpenRa.Game.csproj

@@ -93,16 +93,16 @@
     <Compile Include="GameRules\TechTree.cs" />
     <Compile Include="GameRules\VoiceInfo.cs" />
     <Compile Include="Effects\IEffect.cs" />
-    <Compile Include="IOrderSource.cs" />
+    <Compile Include="Orders\IOrderSource.cs" />
-    <Compile Include="LocalOrderSource.cs" />
+    <Compile Include="Orders\LocalOrderSource.cs" />
     <Compile Include="Effects\Missile.cs" />
-    <Compile Include="NetworkOrderSource.cs" />
+    <Compile Include="Orders\NetworkOrderSource.cs" />
-    <Compile Include="OrderIO.cs" />
+    <Compile Include="Orders\OrderIO.cs" />
-    <Compile Include="OrderManager.cs" />
+    <Compile Include="Orders\OrderManager.cs" />
     <Compile Include="Ore.cs" />
     <Compile Include="PathSearch.cs" />
     <Compile Include="ProductionItem.cs" />
-    <Compile Include="ReplayOrderSource.cs" />
+    <Compile Include="Orders\ReplayOrderSource.cs" />
     <Compile Include="Smudge.cs" />
     <Compile Include="Sound.cs" />
     <Compile Include="Support\Stopwatch.cs" />
@@ -149,15 +149,15 @@
     <Compile Include="Traits\Activities\Sell.cs" />
     <Compile Include="Traits\Activities\Teleport.cs" />
     <Compile Include="BuildingInfluenceMap.cs" />
-    <Compile Include="IOrderGenerator.cs" />
+    <Compile Include="Orders\IOrderGenerator.cs" />
-    <Compile Include="PlaceBuilding.cs" />
+    <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="Race.cs" />
     <Compile Include="Graphics\Sheet.cs" />
     <Compile Include="Support\Log.cs" />
     <Compile Include="PathFinder.cs" />
     <Compile Include="Graphics\Sequence.cs" />
-    <Compile Include="Order.cs" />
+    <Compile Include="Orders\Order.cs" />
     <Compile Include="Graphics\SequenceProvider.cs" />
     <Compile Include="Graphics\SheetBuilder.cs" />
     <Compile Include="Graphics\HardwarePalette.cs" />
@@ -234,14 +234,14 @@
     <Compile Include="Traits\Unit.cs" />
     <Compile Include="Traits\WaterPaletteRotation.cs" />
     <Compile Include="Traits\WithShadow.cs" />
-    <Compile Include="UnitOrders.cs" />
+    <Compile Include="Orders\UnitOrders.cs" />
     <Compile Include="Traits\Util.cs" />
     <Compile Include="UiOverlay.cs" />
     <Compile Include="Graphics\Util.cs" />
     <Compile Include="Graphics\Vertex.cs" />
     <Compile Include="Graphics\Viewport.cs" />
     <Compile Include="UnitInfluenceMap.cs" />
-    <Compile Include="UnitOrderGenerator.cs" />
+    <Compile Include="Orders\UnitOrderGenerator.cs" />
     <Compile Include="VoicePool.cs" />
     <Compile Include="World.cs" />
   </ItemGroup>

OpenRa.Game/Orders/IOrderSource.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	interface IOrderSource
 	{

OpenRa.Game/Orders/LocalOrderSource.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	class LocalOrderSource : IOrderSource
 	{

OpenRa.Game/Orders/NetworkOrderSource.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net.Sockets;
 using System.Threading;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	class NetworkOrderSource : IOrderSource
 	{

OpenRa.Game/Orders/OrderIO.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	static class OrderIO
 	{

OpenRa.Game/Orders/OrderManager.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	class OrderManager
 	{

OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using OpenRa.Game.GameRules;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
-	class PlaceBuilding : IOrderGenerator
+	class PlaceBuildingOrderGenerator : IOrderGenerator
 	{
 		readonly Actor Producer;
 		readonly BuildingInfo Building;
 
-		public PlaceBuilding(Actor producer, string name)
+		public PlaceBuildingOrderGenerator(Actor producer, string name)
 		{
 			Producer = producer;
 			Building = (BuildingInfo)Rules.UnitInfo[ name ];

OpenRa.Game/Orders/ReplayOrderSource.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	class ReplayOrderSource : IOrderSource
 	{

OpenRa.Game/Orders/UnitOrderGenerator.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Linq;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	class UnitOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/UnitOrders.cs

@@ -1,11 +1,9 @@
-using System;
+using System.Drawing;
-using System.Drawing;
-using System.Linq;
 using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits;
 using OpenRa.Game.Graphics;
+using OpenRa.Game.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Orders
 {
 	static class UnitOrders
 	{

OpenRa.Game/Traits/RallyPoint.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using OpenRa.Game.Graphics;
+using OpenRa.Game.Orders;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderUnitRotor.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
+using OpenRa.Game.Graphics;
-using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits
 {