Fix StyleCop warnings in OpenRA.Game

OpenRA.Game/Map/ActorReference.cs

@@ -22,9 +22,10 @@ namespace OpenRA
 		{
 			get { return initDict.Value; }
 		}
+
 		Lazy<TypeDictionary> initDict;
 
-		public ActorReference( string type ) : this(type, new Dictionary<string, MiniYaml>()) { }
+		public ActorReference(string type) : this(type, new Dictionary<string, MiniYaml>()) { }
 
 		public ActorReference(string type, Dictionary<string, MiniYaml> inits)
 		{
@@ -53,6 +54,7 @@ namespace OpenRA
 				var initName = init.GetType().Name;
 				ret.Nodes.Add(new MiniYamlNode(initName.Substring(0, initName.Length - 4), FieldSaver.Save(init)));
 			}
+
 			return ret;
 		}
 

OpenRA.Game/Map/Map.cs

@@ -113,6 +113,12 @@ namespace OpenRA
 
 	public class Map
 	{
+		public const int MaxTilesInCircleRange = 50;
+		public readonly TileShape TileShape;
+		[FieldLoader.Ignore]
+		public readonly WVec[] SubCellOffsets;
+		public readonly SubCell DefaultSubCell;
+		public readonly SubCell LastSubCell;
 		[FieldLoader.Ignore] public IFolder Container;
 		public string Path { get; private set; }
 
@@ -131,12 +137,6 @@ namespace OpenRA
 		public Bitmap CustomPreview;
 		public bool InvalidCustomRules { get; private set; }
 
-		public readonly TileShape TileShape;
-		[FieldLoader.Ignore]
-		public readonly WVec[] SubCellOffsets;
-		public readonly SubCell DefaultSubCell;
-		public readonly SubCell LastSubCell;
-
 		public WVec OffsetOfSubCell(SubCell subCell) { return SubCellOffsets[(int)subCell]; }
 
 		[FieldLoader.LoadUsing("LoadOptions")]
@@ -207,14 +207,14 @@ namespace OpenRA
 			var tileShape = Game.modData.Manifest.TileShape;
 			var tileRef = new TerrainTile(tileset.Templates.First().Key, (byte)0);
 
-			var makeMapTiles =  Exts.Lazy(() =>
+			var makeMapTiles = Exts.Lazy(() =>
 			{
 				var ret = new CellLayer<TerrainTile>(tileShape, size);
 				ret.Clear(tileRef);
 				return ret;
 			});
 
-			var makeMapHeight =  Exts.Lazy(() =>
+			var makeMapHeight = Exts.Lazy(() =>
 			{
 				var ret = new CellLayer<byte>(tileShape, size);
 				ret.Clear(0);
@@ -421,12 +421,10 @@ namespace OpenRA
 			root.Add(new MiniYamlNode("Options", FieldSaver.SaveDifferences(Options, new MapOptions())));
 
 			root.Add(new MiniYamlNode("Players", null,
-				Players.Select(p => new MiniYamlNode("PlayerReference@{0}".F(p.Key), FieldSaver.SaveDifferences(p.Value, new PlayerReference()))).ToList())
-			);
+				Players.Select(p => new MiniYamlNode("PlayerReference@{0}".F(p.Key), FieldSaver.SaveDifferences(p.Value, new PlayerReference()))).ToList()));
 
 			root.Add(new MiniYamlNode("Actors", null,
-				Actors.Value.Select(x => new MiniYamlNode(x.Key, x.Value.Save())).ToList())
-			);
+				Actors.Value.Select(x => new MiniYamlNode(x.Key, x.Value.Save())).ToList()));
 
 			root.Add(new MiniYamlNode("Smudges", MiniYaml.FromList<SmudgeReference>(Smudges.Value)));
 			root.Add(new MiniYamlNode("Rules", null, RuleDefinitions));
@@ -623,7 +621,6 @@ namespace OpenRA
 			// (b) Therefore:
 			//  - ax + by adds (a - b) * 512 + 512 to u
 			//  - ax + by adds (a + b) * 512 + 512 to v
-
 			var z = Contains(cell) ? 512 * MapHeight.Value[cell] : 0;
 			return new WPos(512 * (cell.X - cell.Y + 1), 512 * (cell.X + cell.Y + 1), z);
 		}
@@ -721,7 +718,6 @@ namespace OpenRA
 		string ComputeHash()
 		{
 			// UID is calculated by taking an SHA1 of the yaml and binary data
-
 			using (var ms = new MemoryStream())
 			{
 				// Read the relevant data into the buffer
@@ -837,7 +833,7 @@ namespace OpenRA
 			var edge = rand.Next(2) == 0;
 
 			var x = isX ? rand.Next(Bounds.Left, Bounds.Right) : (edge ? Bounds.Left : Bounds.Right);
-			var y = !isX ? rand.Next(Bounds.Top, Bounds.Bottom) :  (edge ? Bounds.Top : Bounds.Bottom);
+			var y = !isX ? rand.Next(Bounds.Top, Bounds.Bottom) : (edge ? Bounds.Top : Bounds.Bottom);
 
 			return MapToCell(TileShape, new CPos(x, y));
 		}
@@ -851,14 +847,13 @@ namespace OpenRA
 			return new WRange(Math.Min(x, y) * dir.Length);
 		}
 
-		public const int MaxTilesInCircleRange = 50;
 		static CVec[][] TilesByDistance = InitTilesByDistance(MaxTilesInCircleRange);
 
 		static CVec[][] InitTilesByDistance(int max)
 		{
 			var ts = new List<CVec>[max + 1];
 			for (var i = 0; i < max + 1; i++)
-				ts [i] = new List<CVec>();
+				ts[i] = new List<CVec>();
 
 			for (var j = -max; j <= max; j++)
 				for (var i = -max; i <= max; i++)

OpenRA.Game/Map/MapCache.cs

@@ -132,6 +132,7 @@ namespace OpenRA
 
 			// Milliseconds to wait on one loop when nothing to do
 			var emptyDelay = 50;
+
 			// Keep the thread alive for at least 5 seconds after the last minimap generation
 			var maxKeepAlive = 5000 / emptyDelay;
 			var keepAlive = maxKeepAlive;
@@ -151,6 +152,7 @@ namespace OpenRA
 						break;
 					}
 				}
+
 				if (todo.Count == 0)
 				{
 					Thread.Sleep(emptyDelay);
@@ -170,6 +172,7 @@ namespace OpenRA
 						createdPreview = true;
 						bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[p.Map.Tileset], p.Map, modData.DefaultRules, true);
 					}
+
 					// Note: this is not generally thread-safe, but it works here because:
 					//   (a) This worker is the only thread writing to this sheet
 					//   (b) The main thread is the only thread reading this sheet
@@ -192,7 +195,9 @@ namespace OpenRA
 					Thread.Sleep(Environment.ProcessorCount == 1 ? 25 : 5);
 				}
 			}
+
 			sheetBuilder.Current.ReleaseBuffer();
+
 			// The buffer is not fully reclaimed until changes are written out to the texture.
 			// We will access the texture in order to force changes to be written out, allowing the buffer to be freed.
 			Game.RunAfterTick(() => sheetBuilder.Current.GetTexture());

OpenRA.Game/Map/MapPreview.cs

@@ -36,7 +36,7 @@ namespace OpenRA
 		public readonly string map_type;
 		public readonly int players;
 		public readonly Rectangle bounds;
-		public readonly int[] spawnpoints = {};
+		public readonly int[] spawnpoints = { };
 		public readonly string minimap;
 		public readonly bool downloading;
 	}
@@ -142,12 +142,12 @@ namespace OpenRA
 
 						var spawns = new List<CPos>();
 						for (var j = 0; j < r.spawnpoints.Length; j += 2)
-							spawns.Add(new CPos(r.spawnpoints[j], r.spawnpoints[j+1]));
+							spawns.Add(new CPos(r.spawnpoints[j], r.spawnpoints[j + 1]));
 						SpawnPoints = spawns;
 
 						CustomPreview = new Bitmap(new MemoryStream(Convert.FromBase64String(r.minimap)));
 					}
-					catch (Exception) {}
+					catch (Exception) { }
 
 					if (CustomPreview != null)
 						cache.CacheMinimap(this);
@@ -177,7 +177,6 @@ namespace OpenRA
 				var mapUrl = Game.Settings.Game.MapRepository + Uid;
 				try
 				{
-
 					var request = WebRequest.Create(mapUrl);
 					request.Method = "HEAD";
 					var res = request.GetResponse();