From 5e21f6393b6b690e15a8d79df3ee4a2b7917c41d Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 28 Dec 2009 09:33:56 +1300
Subject: [PATCH] more

---
 OpenRa.Game/Actor.cs            | 1 -
 OpenRa.Game/Controller.cs       | 7 +++----
 OpenRa.Game/Player.cs           | 3 +--
 OpenRa.Game/Smudge.cs           | 4 ++--
 OpenRa.Game/UiOverlay.cs        | 1 -
 OpenRa.Game/UnitInfluenceMap.cs | 6 ++----
 OpenRa.Game/World.cs            | 2 --
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index 1a0956ae35..4bfd8a76c6 100755
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRa.Game.GameRules;
-using OpenRa.Game.Graphics;
 using OpenRa.Game.Traits;
 using OpenRa.Game.Traits.Activities;
 
diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs
index adf53bcb1c..a1c0dc38a8 100644
--- a/OpenRa.Game/Controller.cs
+++ b/OpenRa.Game/Controller.cs
@@ -1,12 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
+using IjwFramework.Collections;
 using IjwFramework.Types;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Graphics;
 using OpenRa.Game.Traits;
-using IjwFramework.Collections;
-using System;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Player.cs b/OpenRa.Game/Player.cs
index 74753fdacb..5e40e92b32 100644
--- a/OpenRa.Game/Player.cs
+++ b/OpenRa.Game/Player.cs
@@ -1,9 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits;
 using OpenRa.Game.Graphics;
+using OpenRa.Game.Traits;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Smudge.cs b/OpenRa.Game/Smudge.cs
index ae76b4ab47..2ed4746090 100644
--- a/OpenRa.Game/Smudge.cs
+++ b/OpenRa.Game/Smudge.cs
@@ -1,5 +1,5 @@
-
-using OpenRa.Game.GameRules;
+using OpenRa.Game.GameRules;
+
 namespace OpenRa.Game
 {
 	static class Smudge
diff --git a/OpenRa.Game/UiOverlay.cs b/OpenRa.Game/UiOverlay.cs
index f7abc7dd06..0dfc1272cc 100644
--- a/OpenRa.Game/UiOverlay.cs
+++ b/OpenRa.Game/UiOverlay.cs
@@ -1,5 +1,4 @@
 using System.Drawing;
-using System.Collections.Generic;
 using System.Linq;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Graphics;
diff --git a/OpenRa.Game/UnitInfluenceMap.cs b/OpenRa.Game/UnitInfluenceMap.cs
index de3ecf044b..0982ea957d 100644
--- a/OpenRa.Game/UnitInfluenceMap.cs
+++ b/OpenRa.Game/UnitInfluenceMap.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Collections.Generic;
 using OpenRa.Game.Traits;
 
 namespace OpenRa.Game
@@ -22,7 +22,7 @@ namespace OpenRa.Game
 
 		public void Tick()
 		{
-			// Does this belong here?
+			// Does this belong here? NO, but it's your mess.
 			
 			// Get the crushable actors
 			foreach (var a in Game.world.Actors.Where(b => b.traits.WithInterface<ICrushable>().Any()))
@@ -39,9 +39,7 @@ namespace OpenRa.Game
 							Log.Write("{0} crushes {1}", crusher.Info.Name, a.Info.Name);
 							// Apply the crush action
 							foreach (var crush in a.traits.WithInterface<ICrushable>())
-							{
 								crush.OnCrush(crusher);
-							}
 						}
 					}
 			}
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index fbbecf4ed0..dc55e86213 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
-using OpenRa.Game.Traits;
 using OpenRa.Game.Effects;
 
 namespace OpenRa.Game