Merge pull request #4129 from ScottNZ/refactor

Refactor

GeoIP/Country.cs

@@ -19,7 +19,6 @@
 #endregion
 
 using System;
-using System.IO;
 
 namespace GeoIP
 {

GeoIP/DatabaseInfo.cs

@@ -19,7 +19,6 @@
 #endregion
 
 using System;
-using System.IO;
 
 namespace GeoIP
 {

GeoIP/Location.cs

@@ -19,7 +19,6 @@
 #endregion
 
 using System;
-using System.IO;
 
 namespace GeoIP
 {

GeoIP/Region.cs

@@ -19,7 +19,6 @@
 #endregion
 
 using System;
-using System.IO;
 
 public class Region
 {

OpenRA.Editor/ActorTemplate.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.GameRules;
 using OpenRA.Traits;
 
 namespace OpenRA.Editor

OpenRA.Editor/Form1.cs

@@ -700,7 +700,7 @@ namespace OpenRA.Editor
 		{
 			int imageLength = 0;
 			int type = surface1.Map.MapResources.Value[x, y].Type;
-			var template = surface1.ResourceTemplates.Where(a => a.Value.Info.ResourceType == type).FirstOrDefault().Value;
+			var template = surface1.ResourceTemplates.FirstOrDefault(a => a.Value.Info.ResourceType == type).Value;
 			if (type == 1)
 				imageLength = 12;
 			else if (type == 2)

OpenRA.Editor/MapSelect.cs

@@ -79,7 +79,7 @@ namespace OpenRA.Editor
 				}
 				catch (Exception ed)
 				{
-					Console.WriteLine("No map preview image found: {0}", ed.ToString());
+					Console.WriteLine("No map preview image found: {0}", ed);
 				}
 			}
 		}

OpenRA.Editor/RenderUtils.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using OpenRA.FileFormats;

OpenRA.Editor/Surface.cs

@@ -107,7 +107,6 @@ namespace OpenRA.Editor
 		public Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
 
 		public Surface()
-			: base()
 		{
 			BackColor = Color.Black;
 

OpenRA.FileFormats/Exts.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 

OpenRA.FileFormats/FieldLoader.cs

@@ -314,7 +314,7 @@ namespace OpenRA.FileFormats
 			return null;
 		}
 
-		static object ParseYesNo(string p, System.Type fieldType, string field)
+		static object ParseYesNo(string p, Type fieldType, string field)
 		{
 			p = p.ToLowerInvariant();
 			if (p == "yes") return true;

OpenRA.FileFormats/FieldSaver.cs

@@ -48,7 +48,7 @@ namespace OpenRA.FileFormats
 
 		public static MiniYamlNode SaveField(object o, string field)
 		{
-			return new MiniYamlNode(field, FieldSaver.FormatValue(o, o.GetType().GetField(field)));
+			return new MiniYamlNode(field, FormatValue(o, o.GetType().GetField(field)));
 		}
 
 		public static string FormatValue(object v, Type t)

OpenRA.FileFormats/FileFormats/CRC32.cs

@@ -92,7 +92,7 @@ namespace OpenRA.FileFormats
 		/// A fast (native) CRC32 implementation that can be used on a regular byte arrays.
 		/// </summary>
 		/// <param name="data">The data from which to calculate the checksum.</param>
-		/// <param name="polynomal">The polynomal.</param>
+		/// <param name="polynomial">The polynomial.</param>
 		/// <returns>
 		/// The calculated checksum.
 		/// </returns>
@@ -115,7 +115,7 @@ namespace OpenRA.FileFormats
 		/// </summary>
 		/// <param name="data">		[in,out] If non-null, the.</param>
 		/// <param name="len">		The length of the data data.</param>
-		/// <param name="polynomal">The polynomal to xor with.</param>
+		/// <param name="polynomial">The polynomal to xor with.</param>
 		/// <returns>The calculated checksum.</returns>
 		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
 		{

OpenRA.FileFormats/FileFormats/IniFile.cs

@@ -56,7 +56,7 @@ namespace OpenRA.FileFormats
 		IniSection ProcessSection(string line)
 		{
 			Match m = sectionPattern.Match(line);
-			if (m == null || !m.Success)
+			if (!m.Success)
 				return null;
 			string sectionName = m.Groups[1].Value.ToLowerInvariant();
 

OpenRA.FileFormats/FileFormats/WavLoader.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.IO;
-using System.Text;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/FileSystem/D2kSoundResources.cs

@@ -9,11 +9,8 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/FileSystem/FileSystem.cs

@@ -97,7 +97,7 @@ namespace OpenRA.FileFormats
 				name = Platform.SupportDir + name.Substring(1);
 
 			FolderPaths.Add(name);
-			Action a = () => FileSystem.MountInner(OpenPackage(name, annotation, order++));
+			Action a = () => MountInner(OpenPackage(name, annotation, order++));
 
 			if (optional)
 				try { a(); }
@@ -197,8 +197,8 @@ namespace OpenRA.FileFormats
 			if (assemblyCache.TryGetValue(filename, out a))
 				return a;
 
-			if (FileSystem.Exists(filename))
-				using (var s = FileSystem.Open(filename))
+			if (Exists(filename))
+				using (var s = Open(filename))
 				{
 					var buf = new byte[s.Length];
 					s.Read(buf, 0, buf.Length);

OpenRA.FileFormats/FileSystem/Folder.cs

@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/FileSystem/InstallShieldPackage.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/Graphics/HvaReader.cs

@@ -9,9 +9,7 @@
 
 #endregion
 
-using System;
 using System.IO;
-using System.Linq;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Drawing;
-using System.IO;
 
 namespace OpenRA.FileFormats.Graphics
 {

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -9,8 +9,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace OpenRA
 {

OpenRA.FileFormats/Graphics/R8Reader.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;

OpenRA.FileFormats/Graphics/TileSetRenderer.cs

@@ -11,9 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 
 namespace OpenRA.FileFormats
 {

OpenRA.FileFormats/Graphics/VxlReader.cs

@@ -9,7 +9,6 @@
 
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 

OpenRA.FileFormats/Hotkey.cs

@@ -8,11 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.FileFormats;
-
 namespace OpenRA
 {
 	public struct Hotkey

OpenRA.FileFormats/Keycode.cs

@@ -8,9 +8,7 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace OpenRA
 {

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -8,9 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Drawing;
-
 namespace OpenRA.FileFormats
 {
 	public class PlayerReference

OpenRA.FileFormats/Map/TileSet.cs

@@ -10,8 +10,6 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 

OpenRA.FileFormats/Palette.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;

OpenRA.FileFormats/Primitives/ObservableCollection.cs

@@ -23,7 +23,7 @@ namespace OpenRA.FileFormats.Primitives
 		public event Action<object, object> OnSet = (o, n) => { };
 		public event Action OnRefresh = () => { };
 
-		public ObservableCollection() : base() { }
+		public ObservableCollection() { }
 		public ObservableCollection(IList<T> list) : base(list) { }
 
 		protected override void SetItem(int index, T item)
@@ -53,7 +53,7 @@ namespace OpenRA.FileFormats.Primitives
 
 		public IEnumerable ObservedItems
 		{
-			get { return base.Items; }
+			get { return Items; }
 		}
 	}
 }

OpenRA.FileFormats/Primitives/Pair.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Collections.Generic;
-using System;
 using System.Drawing;
 
 namespace OpenRA.FileFormats

OpenRA.FileFormats/Support/Log.cs

@@ -11,9 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net;
 
 namespace OpenRA
 {

OpenRA.FileFormats/WAngle.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using System.Drawing;
 
 namespace OpenRA
 {

OpenRA.FileFormats/WPos.cs

@@ -8,10 +8,8 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Drawing;
 
 namespace OpenRA
 {

OpenRA.FileFormats/WRange.cs

@@ -8,8 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Drawing;
 using System.Linq;
 
 namespace OpenRA

OpenRA.FileFormats/WRot.cs

@@ -8,9 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Drawing;
-
 namespace OpenRA
 {
 	/// <summary>

OpenRA.FileFormats/WVec.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using System.Drawing;
 
 namespace OpenRA
 {

OpenRA.Game/Download.cs

@@ -21,7 +21,7 @@ namespace OpenRA
 
 		public static string FormatErrorMessage(Exception e)
 		{
-			var ex = e as System.Net.WebException;
+			var ex = e as WebException;
 			if (ex == null)
 				return e.Message;
 
@@ -46,15 +46,15 @@ namespace OpenRA
 			wc.DownloadProgressChanged += (_, a) => onProgress(a);
 			wc.DownloadFileCompleted += (_, a) => onComplete(a, cancelled);
 
-			Game.OnQuit += () => Cancel();
-			wc.DownloadFileCompleted += (_, a) => { Game.OnQuit -= () => Cancel(); };
+			Game.OnQuit += Cancel;
+			wc.DownloadFileCompleted += (_, a) => { Game.OnQuit -= Cancel; };
 
 			wc.DownloadFileAsync(new Uri(url), path);
 		}
 
 		public void Cancel()
 		{
-			Game.OnQuit -= () => Cancel();
+			Game.OnQuit -= Cancel;
 			wc.CancelAsync();
 			cancelled = true;
 		}

OpenRA.Game/Effects/DelayedAction.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Effects
 {

OpenRA.Game/Effects/IEffect.cs

@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Effects
 {

OpenRA.Game/Effects/MoveFlash.cs

@@ -9,10 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.Effects;
-using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Effects
 {

OpenRA.Game/Game.cs

@@ -103,7 +103,7 @@ namespace OpenRA
 		// Load a widget with world, orderManager, worldRenderer args, without adding it to the widget tree
 		public static Widget LoadWidget(World world, string id, Widget parent, WidgetArgs args)
 		{
-			return Game.modData.WidgetLoader.LoadWidget(new WidgetArgs(args)
+			return modData.WidgetLoader.LoadWidget(new WidgetArgs(args)
 			{
 				{ "world", world },
 				{ "orderManager", orderManager },
@@ -135,23 +135,23 @@ namespace OpenRA
 				// worldRenderer is null during the initial install/download screen
 				if (worldRenderer != null)
 				{
-					Game.Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
+					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
 					Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
 					worldRenderer.Draw();
 				}
 				else
-					Game.Renderer.BeginFrame(float2.Zero, 1f);
+					Renderer.BeginFrame(float2.Zero, 1f);
 
 				using (new PerfSample("render_widgets"))
 				{
 					Ui.Draw();
 					var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-					CursorProvider.DrawCursor(Game.Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
+					CursorProvider.DrawCursor(Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
 				}
 
 				using (new PerfSample("render_flip"))
 				{
-					Game.Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
+					Renderer.EndFrame(new DefaultInputHandler(orderManager.world));
 				}
 			}
 
@@ -374,13 +374,13 @@ namespace OpenRA
 
 			JoinLocal();
 
-			if (Game.Settings.Server.Dedicated)
+			if (Settings.Server.Dedicated)
 			{
 				while (true)
 				{
-					Game.Settings.Server.Map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
-					Game.Settings.Save();
-					Game.CreateServer(new ServerSettings(Game.Settings.Server));
+					Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
+					Settings.Save();
+					CreateServer(new ServerSettings(Settings.Server));
 					while (true)
 					{
 						System.Threading.Thread.Sleep(100);
@@ -393,15 +393,14 @@ namespace OpenRA
 							break;
 						}
 					}
-					if (Game.Settings.Server.DedicatedLoop)
+					if (Settings.Server.DedicatedLoop)
 					{
 						Console.WriteLine("Starting a new server instance...");
 						continue;
 					}
-					else
-						break;
+					break;
 				}
-				System.Environment.Exit(0);
+				Environment.Exit(0);
 			}
 			else
 			{
@@ -420,7 +419,7 @@ namespace OpenRA
 			var shellmaps =  modData.AvailableMaps
 				.Where(m => m.Value.UseAsShellmap);
 
-			if (shellmaps.Count() == 0)
+			if (!shellmaps.Any())
 				throw new InvalidDataException("No valid shellmaps available");
 
 			return shellmaps.Random(CosmeticRandom).Key;
@@ -482,7 +481,7 @@ namespace OpenRA
 		public static void CreateServer(ServerSettings settings)
 		{
 			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort),
-			                           Game.Settings.Game.Mods, settings, modData);
+			                           Settings.Game.Mods, settings, modData);
 		}
 
 		public static int CreateLocalServer(string map)
@@ -496,7 +495,7 @@ namespace OpenRA
 			};
 
 			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0),
-			                           Game.Settings.Game.Mods, settings, modData);
+			                           Settings.Game.Mods, settings, modData);
 
 			return server.Port;
 		}
@@ -510,7 +509,7 @@ namespace OpenRA
 		{
 			try
 			{
-				var mod = Game.CurrentMods.FirstOrDefault().Value.Id;
+				var mod = CurrentMods.First().Value.Id;
 				var dirPath = "{1}maps{0}{2}".F(Path.DirectorySeparatorChar, Platform.SupportDir, mod);
 				if(!Directory.Exists(dirPath))
 					Directory.CreateDirectory(dirPath);

OpenRA.Game/GameRules/Settings.cs

@@ -10,12 +10,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
-using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
-using OpenRA.Server;
 
 namespace OpenRA.GameRules
 {

OpenRA.Game/GameRules/SoundInfo.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/BeamRenderable.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
 
 namespace OpenRA.Graphics

OpenRA.Game/Graphics/ContrailRenderable.cs

@@ -8,8 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 

OpenRA.Game/Graphics/CursorProvider.cs

@@ -10,11 +10,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Xml;
 using OpenRA.FileFormats;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/CursorSequence.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Xml;
 using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics

OpenRA.Game/Graphics/MappedImage.cs

@@ -9,8 +9,6 @@
 #endregion
 
 using System.Drawing;
-using System.IO;
-using System.Xml;
 using OpenRA.FileFormats;
 using System.Collections.Generic;
 

OpenRA.Game/Graphics/Minimap.cs

@@ -13,7 +13,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
-using OpenRA.FileFormats;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics

OpenRA.Game/Graphics/Sequence.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -38,7 +38,7 @@ namespace OpenRA.Graphics
 
 		public static Sheet AllocateSheet()
 		{
-			return new Sheet(new Size(Renderer.SheetSize, Renderer.SheetSize));;
+			return new Sheet(new Size(Renderer.SheetSize, Renderer.SheetSize));
 		}
 
 		internal SheetBuilder(SheetType t)

OpenRA.Game/Graphics/SpriteFont.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using System.Runtime.InteropServices;
 using OpenRA.FileFormats;
 using SharpFont;
 

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -8,9 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Drawing;
-using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.Traits;
 

OpenRA.Game/Graphics/TextRenderable.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 
 namespace OpenRA.Graphics

OpenRA.Game/Graphics/Theater.cs

@@ -11,11 +11,8 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.FileFormats.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/Util.cs

@@ -258,7 +258,7 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < 8; i++)
 			{
 				var vec = new float[] {bounds[ix[i]], bounds[iy[i]], bounds[iz[i]], 1};
-				var tvec = Util.MatrixVectorMultiply(mtx, vec);
+				var tvec = MatrixVectorMultiply(mtx, vec);
 
 				ret[0] = Math.Min(ret[0], tvec[0]/tvec[3]);
 				ret[1] = Math.Min(ret[1], tvec[1]/tvec[3]);

OpenRA.Game/Graphics/Viewport.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Support;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/Voxel.cs

@@ -9,11 +9,8 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/VoxelAnimation.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/VoxelRenderable.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;

OpenRA.Game/ModData.cs

@@ -14,7 +14,6 @@ using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA
@@ -163,7 +162,7 @@ namespace OpenRA
 				catch (Exception e)
 				{
 					Console.WriteLine("Failed to load map: {0}", path);
-					Console.WriteLine("Details: {0}", e.ToString());
+					Console.WriteLine("Details: {0}", e);
 				}
 			}
 

OpenRA.Game/Network/FrameData.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

OpenRA.Game/Network/GameServer.cs

@@ -10,8 +10,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.NetworkInformation;
-using System.Threading;
 
 namespace OpenRA.Network
 {

OpenRA.Game/Network/Handshake.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 

OpenRA.Game/Network/OrderManager.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
 

OpenRA.Game/Network/Replay.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using OpenRA.Network;
 
 namespace OpenRA.Network
 {

OpenRA.Game/Network/ReplayConnection.cs

@@ -11,8 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace OpenRA.Network
 {

OpenRA.Game/Network/ReplayRecorderConnection.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using OpenRA.Widgets;
 
 namespace OpenRA.Network

OpenRA.Game/Network/Session.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 
@@ -43,11 +42,11 @@ namespace OpenRA.Network
 							break;
 
 							case "Client":
-							session.Clients.Add(FieldLoader.Load<Session.Client>(y.Value));
+							session.Clients.Add(FieldLoader.Load<Client>(y.Value));
 							break;
 
 							case "Slot":
-							var s = FieldLoader.Load<Session.Slot>(y.Value);
+							var s = FieldLoader.Load<Slot>(y.Value);
 							session.Slots.Add(s.PlayerReference, s);
 							break;
 					}
@@ -144,7 +143,7 @@ namespace OpenRA.Network
 		public Session(string[] mods)
 		{
 			this.GlobalSettings.Mods = mods.ToArray();
-			this.GlobalSettings.GameUid = System.Guid.NewGuid().ToString();
+			this.GlobalSettings.GameUid = Guid.NewGuid().ToString();
 		}
 
 		public string Serialize()

OpenRA.Game/Network/SyncReport.cs

@@ -32,7 +32,7 @@ namespace OpenRA.Network
 		{
 			this.orderManager = orderManager;
 			for (var i = 0; i < NumSyncReports; i++)
-				syncReports[i] = new SyncReport.Report();
+				syncReports[i] = new Report();
 		}
 
 		internal void UpdateSyncReport()

OpenRA.Game/Network/UPnP.cs

@@ -11,8 +11,6 @@
 using System;
 
 using Mono.Nat;
-using Mono.Nat.Pmp;
-using Mono.Nat.Upnp;
 
 namespace OpenRA.Network
 {

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -9,9 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {

OpenRA.Game/Server/Connection.cs

@@ -12,8 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
-using System.Net.NetworkInformation;
-using System.Threading;
 
 namespace OpenRA.Server
 {

OpenRA.Game/Server/Exts.cs

@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System;
 
 namespace OpenRA.Server
 {

OpenRA.Game/Server/Server.cs

@@ -340,7 +340,7 @@ namespace OpenRA.Server
 
 				if (File.Exists("{0}motd_{1}.txt".F(Platform.SupportDir, LobbyInfo.GlobalSettings.Mods[0])))
 				{
-					var motd = System.IO.File.ReadAllText("{0}motd_{1}.txt".F(Platform.SupportDir, LobbyInfo.GlobalSettings.Mods[0]));
+					var motd = File.ReadAllText("{0}motd_{1}.txt".F(Platform.SupportDir, LobbyInfo.GlobalSettings.Mods[0]));
 					SendOrderTo(newConn, "Message", motd);
 				}
 

OpenRA.Game/Sound.cs

@@ -272,7 +272,7 @@ namespace OpenRA
 		}
 
 		// Returns true if played successfully
-		public static bool PlayPredefined(Player p, Actor voicedUnit, string type, string definition, string variant, bool attentuateVolume)
+		public static bool PlayPredefined(Player p, Actor voicedUnit, string type, string definition, string variant, bool attenuateVolume)
 		{
 			if (definition == null) return false;
 
@@ -323,7 +323,7 @@ namespace OpenRA
 			if (!String.IsNullOrEmpty(name)	&& (p == null || p == p.World.LocalPlayer))
 				soundEngine.Play2D(sounds[name],
 					false, true, WPos.Zero,
-					InternalSoundVolume, attentuateVolume);
+					InternalSoundVolume, attenuateVolume);
 
 			return true;
 		}
@@ -604,8 +604,8 @@ namespace OpenRA
 				int state;
 				Al.alGetSourcei(b, Al.AL_SOURCE_STATE, out state);
 				return ((state == Al.AL_PLAYING || state == Al.AL_PAUSED) &&
-					   ((music != null) ? b != ((OpenAlSound)music).source : true) &&
-					   ((video != null) ? b != ((OpenAlSound)video).source : true));
+					   ((music == null) || b != ((OpenAlSound)music).source) &&
+					   ((video == null) || b != ((OpenAlSound)video).source));
 			}).ToList();
 			foreach (var s in sounds)
 			{

OpenRA.Game/Support/Arguments.cs

@@ -21,11 +21,11 @@ namespace OpenRA
 
 		public Arguments(params string[] src)
 		{
-			Regex regex = new Regex("([^=]+)=(.*)");
-			foreach (string s in src)
+			var regex = new Regex("([^=]+)=(.*)");
+			foreach (var s in src)
 			{
 				Match m = regex.Match(s);
-				if (m == null || !m.Success)
+				if (!m.Success)
 					continue;
 
 				args[m.Groups[1].Value] = m.Groups[2].Value;

OpenRA.Game/Traits/Activity.cs

@@ -8,10 +8,8 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/BodyOrientation.cs

@@ -8,10 +8,6 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Graphics;
 using OpenRA.FileFormats;
 
 namespace OpenRA.Traits

OpenRA.Game/Traits/DebugPauseState.cs

@@ -8,9 +8,6 @@
  */
 #endregion
 
-using System.Collections.Generic;
-using OpenRA.Network;
-
 namespace OpenRA.Traits
 {
 	public class DebugPauseStateInfo : ITraitInfo

OpenRA.Game/Traits/DrawLineToTarget.cs

@@ -10,7 +10,6 @@
 
 using System.Drawing;
 using OpenRA.Graphics;
-using OpenRA.Effects;
 using System.Collections.Generic;
 
 namespace OpenRA.Traits

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -8,8 +8,6 @@
  */
 #endregion
 
-using System;
-
 namespace OpenRA.Traits
 {
 	public class DeveloperModeInfo : ITraitInfo

OpenRA.Game/Traits/Player/FrozenActorLayer.cs

@@ -8,13 +8,10 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/Player/PlayerColorPalette.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Drawing;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
 

OpenRA.Game/Traits/Player/PlayerResources.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Linq;
-using OpenRA.GameRules;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/RejectsOrders.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Network;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/Render/RenderSimple.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/Render/RenderSprites.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.FileFormats;
 

OpenRA.Game/Traits/SelectionDecorations.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
 
@@ -65,7 +64,7 @@ namespace OpenRA.Traits
 				return;
 
 			var pipSources = self.TraitsImplementing<IPips>();
-			if (pipSources.Count() == 0)
+			if (!pipSources.Any())
 				return;
 
 			var pipImages = new Animation("pips");

OpenRA.Game/Traits/Target.cs

@@ -32,14 +32,14 @@ namespace OpenRA.Traits
 		public static Target FromOrder(Order o)
 		{
 			return o.TargetActor != null
-				? Target.FromActor(o.TargetActor)
-				: Target.FromCell(o.TargetLocation);
+				? FromActor(o.TargetActor)
+				: FromCell(o.TargetLocation);
 		}
 
 		public static Target FromActor(Actor a)
 		{
 			if (a == null)
-				return Target.Invalid;
+				return Invalid;
 
 			return new Target
 			{

OpenRA.Game/Traits/Util.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Support;
 
@@ -135,7 +134,7 @@ namespace OpenRA.Traits
 		public static IEnumerable<CPos> AdjacentCells(Target target)
 		{
 			var cells = target.Positions.Select(p => p.ToCPos()).Distinct();
-			return Util.ExpandFootprint(cells, true);
+			return ExpandFootprint(cells, true);
 		}
 	}
 }

OpenRA.Game/Traits/World/ActorMap.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.Traits;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
 

OpenRA.Game/Traits/World/ScreenMap.cs

@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Traits/World/Shroud.cs

@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {

OpenRA.Game/Widgets/BackgroundWidget.cs

@@ -23,7 +23,7 @@ namespace OpenRA.Widgets
 			WidgetUtils.DrawPanel(Background, RenderBounds);
 		}
 
-		public BackgroundWidget() : base() { }
+		public BackgroundWidget() { }
 
 		bool moving;
 		int2? prevMouseLocation;