fix bogus sequences in cnc

It should be moved out of IngameChromeLogic, but I don't know where to..

.gitignore

@@ -56,3 +56,5 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 Logs/
 Replays/
 settings.yaml
+\#*
+.*.sw?

AUTHORS

@@ -1,32 +1,36 @@
 AUTHORS
 
 The OpenRA developers are:
-	* Alli Witheford
-	* Caleb Anderson
-	* Chris Forbes
-	* Curtis Shmyr
-	* Daniel Hernandez
-	* Matthew Bowra-Dean
-	* Mike Bundy
+	* Alli Witheford	(alzeih)
+	* Caleb Anderson	(RobotCaleb)
+	* Chris Forbes		(chrisf)
+	* Curtis Shmyr		(hamb)
+	* Daniel Hernandez	(Mancano)
+	* Matthew Bowra-Dean	(beedee)
+	* Mike Bundy		(kehaar)
 
 Also thanks to:
+	* Akseli Virtanen       (RAGEQUIT)
 	* Andrew Riedi
 	* Bellator
-	* Erasmus Schroder
-	* Jeff Harris
-	* Joakim Lindberg
-	* Katzsmile
+	* Christer Ulfsparre	(Holloweye)
+	* Erasmus Schroder	(rasco)
+	* Igor Popov		(ihptru)
+	* Jeff Harris		(jeff_1amstudios)
+	* Joakim Lindberg	(booom3)
+	* Kenny Hoxworth	(hoxworth)
 	* Lawrence Wang
-	* Matthew Gatland
+	* Mark Olson		(markolson)
+	* Matthew Gatland	(mgatland)
+	* Max Ugrumov		(katzsmile)
 	* Max621
 	* Nukem
-	* Paolo Chiodi
-	* Paul Dovydaitis
-	* Ragequit
-	* Tim Mylemans
+	* Paolo Chiodi		(paolochiodi)
+	* Paul Dovydaitis	(pdovy)
+	* Raymond Martineau	(mart0258)
 	* Riderr3
-	* Raymond Martineau
+	* Tim Mylemans		(gecko)
 
 Past developers included:
-	* Paul Chote
-	* Robert Pepperell
+	* Paul Chote		(pchote)
+	* Robert Pepperell	(ytinasni)

CHANGELOG

@@ -1,3 +1,43 @@
+NEW:
+	Engine:
+		General performance improvements
+		Fixed minimap export breaking subsequent actions in the editor
+		Added owner chooser for new actors in the editor
+		Added actor info panel in the editor (doubleclick)
+		Added a Setup Default Players menu item to map editor
+	Both Mods:
+		Server lobbies upon creation use the previously played map
+		Added support for a Game.ConnectTo argument which allows clients to direct connect to a server when game is launched
+		Helicopters now bob slightly in flight
+		Bots now repair their own buildings
+		Fixed a bug where bots would be unable to set rallypoints for production buildings
+		Bots now maintain a level of aggro on enemy units
+		Made SpawnMPUnits' initial unit configurable
+		Added a dropdown list in the map editor for setting an actor's owner upon placement
+		Replaced the server browser with a new and awesome one
+		Fixed a bug where infantry squish sounds weren't positioned
+		Fixed a bug where actor priority wasn't correct for doubleclick
+
+	Red Alert:
+		Fixed a crash which occurred when playing an online game with Hard AI
+		Fixed a bug where planes could stack more than 1-per-airfield
+		Fixed a bug where planes would not rearm at airfields
+		Improved logic for sending planes and helicopters back to base
+		Changed MIG to fire 2 missiles per burst instead of 4
+		Changed HELI (longbow) to fire missiles in bursts of 2
+		Added a Show Shellmap setting
+		Changed team color picker to match C&C's
+		Fixed a bug where infantry could not pass over anti-tank mines, and vice versa
+		Fixed a bug where the shellmap would reload unnecessarily when disconnecting from a lobby that hasn't started
+		Added AutoTarget capability to submarines, but they are set to HoldFire stance by default
+		New Map: Bombardment Islands (Sprog)
+		New Map: Engagement (Nukem)
+		New Map: Man to Man (Nukem)
+		New Map: Asymetric Battle (Seru)
+	C&C:
+		Changed the bot spawn picker to match RA's
+		Reduced delay of tooltips
+
 20111013:
 	Engine:
 		Fixed broken client IDs if players drop before the game starts

OpenRA.Editor/ActorPropertiesDialog.Designer.cs

@@ -0,0 +1,92 @@
+namespace OpenRA.Editor
+{
+	partial class ActorPropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+			this.SuspendLayout();
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(226, 333);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 0;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button2.Enabled = false;
+			this.button2.Location = new System.Drawing.Point(145, 333);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 0;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// flowLayoutPanel1
+			// 
+			this.flowLayoutPanel1.AutoScroll = true;
+			this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.flowLayoutPanel1.Location = new System.Drawing.Point(13, 13);
+			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+			this.flowLayoutPanel1.Size = new System.Drawing.Size(288, 314);
+			this.flowLayoutPanel1.TabIndex = 1;
+			// 
+			// ActorPropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(313, 368);
+			this.Controls.Add(this.flowLayoutPanel1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ActorPropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Actor Properties";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+	}
+}

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -0,0 +1,49 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+
+namespace OpenRA.Editor
+{
+	public partial class ActorPropertiesDialog : Form
+	{
+		public ActorPropertiesDialog()
+		{
+			InitializeComponent();
+		}
+
+		public void AddRow(string name, Control c)
+		{
+			flowLayoutPanel1.Controls.Add(new Label
+			{
+				Text = name,
+				Width = flowLayoutPanel1.Width * 3 / 10,
+				Height = 25,
+				TextAlign = ContentAlignment.MiddleLeft,
+			});
+
+			c.Width = flowLayoutPanel1.Width * 6 / 10 - 25;
+			c.Height = 25;
+			flowLayoutPanel1.Controls.Add(c);
+		}
+
+		public Control MakeEditorControl(Type t, Func<object> getter, Action<object> setter)
+		{
+			var r = new TextBox();
+			r.Text = FieldSaver.FormatValue(getter(), t);
+			r.LostFocus += (e,_) => setter(FieldLoader.GetValue("<editor internals>", t, r.Text));
+			r.Enabled = false;
+			return r;
+		}
+	}
+}

OpenRA.Editor/ActorPropertiesDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OpenRA.Editor/ActorTool.cs

@@ -22,10 +22,8 @@ namespace OpenRA.Editor
 
 		public void Preview(Surface surface, SGraphics g)
 		{
-			/* todo: include the player
-				* in the brush so we can color new buildings too */
-
-			surface.DrawActor(g, surface.GetBrushLocation(), Actor, null);
+			surface.DrawActor(g, surface.GetBrushLocation(), Actor,
+				surface.GetPaletteForPlayer(surface.NewActorOwner));
 		}
 
 		public void Apply(Surface surface)
@@ -33,7 +31,7 @@ namespace OpenRA.Editor
 			if (surface.Map.Actors.Value.Any(a => a.Value.Location() == surface.GetBrushLocation()))
 				return;
 
-			var owner = "Neutral";
+			var owner = surface.NewActorOwner;
 			var id = NextActorName(surface);
 			surface.Map.Actors.Value[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
 			{

OpenRA.Editor/Form1.Designer.cs

@@ -47,12 +47,13 @@ namespace OpenRA.Editor
 			this.tabPage1 = new System.Windows.Forms.TabPage();
 			this.tilePalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.panel1 = new System.Windows.Forms.Panel();
 			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
+			this.actorOwnerChooser = new System.Windows.Forms.ComboBox();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
 			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.surface1 = new OpenRA.Editor.Surface();
 			this.tt = new System.Windows.Forms.ToolTip(this.components);
-			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
 			this.splitContainer3 = new System.Windows.Forms.SplitContainer();
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,12 +75,13 @@ namespace OpenRA.Editor
 			this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.showActorNamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.showGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.fixOpenAreasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.setupDefaultPlayersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripComboBox1 = new System.Windows.Forms.ToolStripComboBox();
 			this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.toolStripStatusLabelFiller = new System.Windows.Forms.ToolStripStatusLabel();
 			this.toolStripStatusLabelMousePosition = new System.Windows.Forms.ToolStripStatusLabel();
-			this.fixOpenAreasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
@@ -90,6 +92,7 @@ namespace OpenRA.Editor
 			this.tabControl1.SuspendLayout();
 			this.tabPage1.SuspendLayout();
 			this.tabPage2.SuspendLayout();
+			this.panel1.SuspendLayout();
 			this.tabPage3.SuspendLayout();
 			this.splitContainer3.Panel1.SuspendLayout();
 			this.splitContainer3.Panel2.SuspendLayout();
@@ -97,44 +100,44 @@ namespace OpenRA.Editor
 			this.menuStrip1.SuspendLayout();
 			this.statusStrip1.SuspendLayout();
 			this.SuspendLayout();
-			//
+			// 
 			// splitContainer1
-			//
+			// 
 			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
 			this.splitContainer1.Name = "splitContainer1";
-			//
+			// 
 			// splitContainer1.Panel1
-			//
+			// 
 			this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
-			//
+			// 
 			// splitContainer1.Panel2
-			//
+			// 
 			this.splitContainer1.Panel2.Controls.Add(this.surface1);
 			this.splitContainer1.Size = new System.Drawing.Size(985, 744);
 			this.splitContainer1.SplitterDistance = 198;
 			this.splitContainer1.TabIndex = 0;
-			//
+			// 
 			// splitContainer2
-			//
+			// 
 			this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.splitContainer2.Location = new System.Drawing.Point(0, 0);
 			this.splitContainer2.Name = "splitContainer2";
 			this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			//
+			// 
 			// splitContainer2.Panel1
-			//
+			// 
 			this.splitContainer2.Panel1.Controls.Add(this.pmMiniMap);
-			//
+			// 
 			// splitContainer2.Panel2
-			//
+			// 
 			this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
 			this.splitContainer2.Size = new System.Drawing.Size(198, 744);
 			this.splitContainer2.SplitterDistance = 164;
 			this.splitContainer2.TabIndex = 1;
-			//
+			// 
 			// pmMiniMap
-			//
+			// 
 			this.pmMiniMap.BackColor = System.Drawing.Color.Black;
 			this.pmMiniMap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
 			this.pmMiniMap.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -144,9 +147,9 @@ namespace OpenRA.Editor
 			this.pmMiniMap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 			this.pmMiniMap.TabIndex = 1;
 			this.pmMiniMap.TabStop = false;
-			//
+			// 
 			// tabControl1
-			//
+			// 
 			this.tabControl1.Controls.Add(this.tabPage1);
 			this.tabControl1.Controls.Add(this.tabPage2);
 			this.tabControl1.Controls.Add(this.tabPage3);
@@ -159,9 +162,9 @@ namespace OpenRA.Editor
 			this.tabControl1.SelectedIndex = 0;
 			this.tabControl1.Size = new System.Drawing.Size(198, 576);
 			this.tabControl1.TabIndex = 0;
-			//
+			// 
 			// tabPage1
-			//
+			// 
 			this.tabPage1.Controls.Add(this.tilePalette);
 			this.tabPage1.Location = new System.Drawing.Point(4, 20);
 			this.tabPage1.Name = "tabPage1";
@@ -170,9 +173,9 @@ namespace OpenRA.Editor
 			this.tabPage1.TabIndex = 0;
 			this.tabPage1.Text = "Templates";
 			this.tabPage1.UseVisualStyleBackColor = true;
-			//
+			// 
 			// tilePalette
-			//
+			// 
 			this.tilePalette.AutoScroll = true;
 			this.tilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -180,10 +183,11 @@ namespace OpenRA.Editor
 			this.tilePalette.Name = "tilePalette";
 			this.tilePalette.Size = new System.Drawing.Size(184, 546);
 			this.tilePalette.TabIndex = 1;
-			//
+			// 
 			// tabPage2
-			//
-			this.tabPage2.Controls.Add(this.actorPalette);
+			// 
+			this.tabPage2.Controls.Add(this.panel1);
+			this.tabPage2.Controls.Add(this.actorOwnerChooser);
 			this.tabPage2.Location = new System.Drawing.Point(4, 20);
 			this.tabPage2.Name = "tabPage2";
 			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
@@ -191,19 +195,41 @@ namespace OpenRA.Editor
 			this.tabPage2.TabIndex = 1;
 			this.tabPage2.Text = "Actors";
 			this.tabPage2.UseVisualStyleBackColor = true;
-			//
+			// 
+			// panel1
+			// 
+			this.panel1.Controls.Add(this.actorPalette);
+			this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.panel1.Location = new System.Drawing.Point(3, 24);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(184, 525);
+			this.panel1.TabIndex = 4;
+			// 
 			// actorPalette
-			//
+			// 
 			this.actorPalette.AutoScroll = true;
 			this.actorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.actorPalette.Location = new System.Drawing.Point(3, 3);
+			this.actorPalette.Location = new System.Drawing.Point(0, 0);
 			this.actorPalette.Name = "actorPalette";
-			this.actorPalette.Size = new System.Drawing.Size(184, 546);
-			this.actorPalette.TabIndex = 2;
-			//
+			this.actorPalette.Size = new System.Drawing.Size(184, 525);
+			this.actorPalette.TabIndex = 3;
+			// 
+			// actorOwnerChooser
+			// 
+			this.actorOwnerChooser.Dock = System.Windows.Forms.DockStyle.Top;
+			this.actorOwnerChooser.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.actorOwnerChooser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.actorOwnerChooser.FormattingEnabled = true;
+			this.actorOwnerChooser.Location = new System.Drawing.Point(3, 3);
+			this.actorOwnerChooser.Name = "actorOwnerChooser";
+			this.actorOwnerChooser.Size = new System.Drawing.Size(184, 21);
+			this.actorOwnerChooser.TabIndex = 3;
+			this.actorOwnerChooser.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.onDrawPlayerItem);
+			this.actorOwnerChooser.SelectionChangeCommitted += new System.EventHandler(this.onSelectOwner);
+			// 
 			// tabPage3
-			//
+			// 
 			this.tabPage3.Controls.Add(this.resourcePalette);
 			this.tabPage3.Location = new System.Drawing.Point(4, 20);
 			this.tabPage3.Name = "tabPage3";
@@ -211,9 +237,9 @@ namespace OpenRA.Editor
 			this.tabPage3.TabIndex = 2;
 			this.tabPage3.Text = "Resources";
 			this.tabPage3.UseVisualStyleBackColor = true;
-			//
+			// 
 			// resourcePalette
-			//
+			// 
 			this.resourcePalette.AutoScroll = true;
 			this.resourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -221,9 +247,9 @@ namespace OpenRA.Editor
 			this.resourcePalette.Name = "resourcePalette";
 			this.resourcePalette.Size = new System.Drawing.Size(190, 552);
 			this.resourcePalette.TabIndex = 3;
-			//
+			// 
 			// surface1
-			//
+			// 
 			this.surface1.BackColor = System.Drawing.Color.Black;
 			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.surface1.Location = new System.Drawing.Point(0, 0);
@@ -231,39 +257,33 @@ namespace OpenRA.Editor
 			this.surface1.Size = new System.Drawing.Size(783, 744);
 			this.surface1.TabIndex = 5;
 			this.surface1.Text = "surface1";
-			//
+			// 
 			// tt
-			//
+			// 
 			this.tt.ShowAlways = true;
-			//
-			// saveFileDialog
-			//
-			this.saveFileDialog.DefaultExt = "*.png";
-			this.saveFileDialog.Filter = "PNG Image (*.png)|";
-			this.saveFileDialog.Title = "Export minimap to PNG";
-			//
+			// 
 			// splitContainer3
-			//
+			// 
 			this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
 			this.splitContainer3.IsSplitterFixed = true;
 			this.splitContainer3.Location = new System.Drawing.Point(0, 0);
 			this.splitContainer3.Name = "splitContainer3";
 			this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			//
+			// 
 			// splitContainer3.Panel1
-			//
+			// 
 			this.splitContainer3.Panel1.Controls.Add(this.menuStrip1);
-			//
+			// 
 			// splitContainer3.Panel2
-			//
+			// 
 			this.splitContainer3.Panel2.Controls.Add(this.splitContainer1);
 			this.splitContainer3.Size = new System.Drawing.Size(985, 773);
 			this.splitContainer3.SplitterDistance = 25;
 			this.splitContainer3.TabIndex = 6;
-			//
+			// 
 			// menuStrip1
-			//
+			// 
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileToolStripMenuItem,
             this.mapToolStripMenuItem,
@@ -274,9 +294,9 @@ namespace OpenRA.Editor
 			this.menuStrip1.Size = new System.Drawing.Size(985, 27);
 			this.menuStrip1.TabIndex = 1;
 			this.menuStrip1.Text = "menuStrip1";
-			//
+			// 
 			// fileToolStripMenuItem
-			//
+			// 
 			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.newToolStripMenuItem,
             this.toolStripSeparator1,
@@ -291,165 +311,180 @@ namespace OpenRA.Editor
 			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
 			this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 23);
 			this.fileToolStripMenuItem.Text = "&File";
-			//
+			// 
 			// newToolStripMenuItem
-			//
+			// 
 			this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image")));
 			this.newToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia;
 			this.newToolStripMenuItem.Name = "newToolStripMenuItem";
 			this.newToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.newToolStripMenuItem.Text = "&New...";
 			this.newToolStripMenuItem.Click += new System.EventHandler(this.NewClicked);
-			//
+			// 
 			// toolStripSeparator1
-			//
+			// 
 			this.toolStripSeparator1.Name = "toolStripSeparator1";
 			this.toolStripSeparator1.Size = new System.Drawing.Size(120, 6);
-			//
+			// 
 			// openToolStripMenuItem
-			//
+			// 
 			this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image")));
 			this.openToolStripMenuItem.Name = "openToolStripMenuItem";
 			this.openToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.openToolStripMenuItem.Text = "&Open...";
 			this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked);
-			//
+			// 
 			// saveToolStripMenuItem
-			//
+			// 
 			this.saveToolStripMenuItem.Enabled = false;
 			this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
 			this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
 			this.saveToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.saveToolStripMenuItem.Text = "&Save";
 			this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked);
-			//
+			// 
 			// saveAsToolStripMenuItem
-			//
+			// 
 			this.saveAsToolStripMenuItem.Enabled = false;
 			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
 			this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.saveAsToolStripMenuItem.Text = "Save &As...";
 			this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsClicked);
-			//
+			// 
 			// toolStripSeparator2
-			//
+			// 
 			this.toolStripSeparator2.Name = "toolStripSeparator2";
 			this.toolStripSeparator2.Size = new System.Drawing.Size(120, 6);
-			//
+			// 
 			// toolStripMenuItem1
-			//
+			// 
 			this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.cCRedAlertMapToolStripMenuItem,
             this.bitmapToolStripMenuItem});
 			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
 			this.toolStripMenuItem1.Size = new System.Drawing.Size(123, 22);
 			this.toolStripMenuItem1.Text = "&Import";
-			//
+			// 
 			// cCRedAlertMapToolStripMenuItem
-			//
+			// 
 			this.cCRedAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image")));
 			this.cCRedAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem";
 			this.cCRedAlertMapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
 			this.cCRedAlertMapToolStripMenuItem.Text = "&C&&C / Red Alert Map...";
 			this.cCRedAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked);
-			//
+			// 
 			// bitmapToolStripMenuItem
-			//
+			// 
 			this.bitmapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("bitmapToolStripMenuItem.Image")));
 			this.bitmapToolStripMenuItem.Name = "bitmapToolStripMenuItem";
 			this.bitmapToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
 			this.bitmapToolStripMenuItem.Text = "&Bitmap...";
 			this.bitmapToolStripMenuItem.Visible = false;
-			//
+			// 
 			// mnuExport
-			//
+			// 
 			this.mnuExport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.mnuMinimapToPNG});
 			this.mnuExport.Name = "mnuExport";
 			this.mnuExport.Size = new System.Drawing.Size(123, 22);
 			this.mnuExport.Text = "&Export";
-			//
+			// 
 			// mnuMinimapToPNG
-			//
+			// 
 			this.mnuMinimapToPNG.Enabled = false;
 			this.mnuMinimapToPNG.Image = ((System.Drawing.Image)(resources.GetObject("mnuMinimapToPNG.Image")));
 			this.mnuMinimapToPNG.Name = "mnuMinimapToPNG";
 			this.mnuMinimapToPNG.Size = new System.Drawing.Size(163, 22);
 			this.mnuMinimapToPNG.Text = "Minimap to PNG";
 			this.mnuMinimapToPNG.Click += new System.EventHandler(this.ExportMinimap);
-			//
+			// 
 			// toolStripSeparator3
-			//
+			// 
 			this.toolStripSeparator3.Name = "toolStripSeparator3";
 			this.toolStripSeparator3.Size = new System.Drawing.Size(120, 6);
-			//
+			// 
 			// exitToolStripMenuItem
-			//
+			// 
 			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
 			this.exitToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
 			this.exitToolStripMenuItem.Text = "E&xit";
 			this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked);
-			//
+			// 
 			// mapToolStripMenuItem
-			//
+			// 
 			this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.propertiesToolStripMenuItem,
             this.resizeToolStripMenuItem,
             this.showActorNamesToolStripMenuItem,
             this.showGridToolStripMenuItem,
-            this.fixOpenAreasToolStripMenuItem});
+            this.fixOpenAreasToolStripMenuItem,
+            this.setupDefaultPlayersMenuItem});
 			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
 			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 23);
 			this.mapToolStripMenuItem.Text = "&Map";
-			//
+			// 
 			// propertiesToolStripMenuItem
-			//
+			// 
 			this.propertiesToolStripMenuItem.Enabled = false;
 			this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image")));
 			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
 			this.propertiesToolStripMenuItem.Text = "&Properties...";
 			this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked);
-			//
+			// 
 			// resizeToolStripMenuItem
-			//
+			// 
 			this.resizeToolStripMenuItem.Enabled = false;
 			this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image")));
 			this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
-			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.resizeToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
 			this.resizeToolStripMenuItem.Text = "&Resize...";
 			this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked);
-			//
+			// 
 			// showActorNamesToolStripMenuItem
-			//
+			// 
 			this.showActorNamesToolStripMenuItem.Name = "showActorNamesToolStripMenuItem";
-			this.showActorNamesToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.showActorNamesToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
 			this.showActorNamesToolStripMenuItem.Text = "Show Actor &Names";
 			this.showActorNamesToolStripMenuItem.Click += new System.EventHandler(this.ShowActorNamesClicked);
-			//
+			// 
 			// showGridToolStripMenuItem
-			//
+			// 
 			this.showGridToolStripMenuItem.Name = "showGridToolStripMenuItem";
-			this.showGridToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.showGridToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
 			this.showGridToolStripMenuItem.Text = "Show &Grid";
 			this.showGridToolStripMenuItem.Click += new System.EventHandler(this.ShowGridClicked);
-			//
+			// 
+			// fixOpenAreasToolStripMenuItem
+			// 
+			this.fixOpenAreasToolStripMenuItem.Name = "fixOpenAreasToolStripMenuItem";
+			this.fixOpenAreasToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.fixOpenAreasToolStripMenuItem.Text = "&Fix Open Areas";
+			this.fixOpenAreasToolStripMenuItem.Click += new System.EventHandler(this.FixOpenAreas);
+			// 
+			// setupDefaultPlayersMenuItem
+			// 
+			this.setupDefaultPlayersMenuItem.Name = "setupDefaultPlayersMenuItem";
+			this.setupDefaultPlayersMenuItem.Size = new System.Drawing.Size(185, 22);
+			this.setupDefaultPlayersMenuItem.Text = "&Setup Default Players";
+			this.setupDefaultPlayersMenuItem.Click += new System.EventHandler(this.SetupDefaultPlayers);
+			// 
 			// toolStripComboBox1
-			//
+			// 
 			this.toolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
 			this.toolStripComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.toolStripComboBox1.Name = "toolStripComboBox1";
 			this.toolStripComboBox1.Size = new System.Drawing.Size(121, 23);
-			//
+			// 
 			// toolStripLabel1
-			//
+			// 
 			this.toolStripLabel1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
 			this.toolStripLabel1.Name = "toolStripLabel1";
 			this.toolStripLabel1.Size = new System.Drawing.Size(71, 20);
 			this.toolStripLabel1.Text = "Active Mod:";
-			//
+			// 
 			// statusStrip1
-			//
+			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelFiller,
             this.toolStripStatusLabelMousePosition});
@@ -458,29 +493,22 @@ namespace OpenRA.Editor
 			this.statusStrip1.Size = new System.Drawing.Size(985, 22);
 			this.statusStrip1.TabIndex = 7;
 			this.statusStrip1.Text = "statusStrip1";
-			//
+			// 
 			// toolStripStatusLabelFiller
-			//
+			// 
 			this.toolStripStatusLabelFiller.Name = "toolStripStatusLabelFiller";
 			this.toolStripStatusLabelFiller.Size = new System.Drawing.Size(948, 17);
 			this.toolStripStatusLabelFiller.Spring = true;
-			//
+			// 
 			// toolStripStatusLabelMousePosition
-			//
+			// 
 			this.toolStripStatusLabelMousePosition.Name = "toolStripStatusLabelMousePosition";
 			this.toolStripStatusLabelMousePosition.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
 			this.toolStripStatusLabelMousePosition.Size = new System.Drawing.Size(22, 17);
 			this.toolStripStatusLabelMousePosition.Text = "0,0";
-			//
-			// fixOpenAreasToolStripMenuItem
-			//
-			this.fixOpenAreasToolStripMenuItem.Name = "fixOpenAreasToolStripMenuItem";
-			this.fixOpenAreasToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
-			this.fixOpenAreasToolStripMenuItem.Text = "&Fix Open Areas";
-			this.fixOpenAreasToolStripMenuItem.Click += new System.EventHandler(this.FixOpenAreas);
-			//
+			// 
 			// Form1
-			//
+			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(985, 773);
@@ -505,6 +533,7 @@ namespace OpenRA.Editor
 			this.tabControl1.ResumeLayout(false);
 			this.tabPage1.ResumeLayout(false);
 			this.tabPage2.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
 			this.tabPage3.ResumeLayout(false);
 			this.splitContainer3.Panel1.ResumeLayout(false);
 			this.splitContainer3.Panel1.PerformLayout();
@@ -527,13 +556,11 @@ namespace OpenRA.Editor
 		private System.Windows.Forms.TabPage tabPage1;
 		private System.Windows.Forms.FlowLayoutPanel tilePalette;
 		private System.Windows.Forms.TabPage tabPage2;
-		private System.Windows.Forms.FlowLayoutPanel actorPalette;
 		private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.FlowLayoutPanel resourcePalette;
+		private System.Windows.Forms.FlowLayoutPanel resourcePalette;
 		private Surface surface1;
-        private System.Windows.Forms.PictureBox pmMiniMap;
+		private System.Windows.Forms.PictureBox pmMiniMap;
 		private System.Windows.Forms.SplitContainer splitContainer2;
-		private System.Windows.Forms.SaveFileDialog saveFileDialog;
 		private System.Windows.Forms.SplitContainer splitContainer3;
 		private System.Windows.Forms.StatusStrip statusStrip1;
 		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelMousePosition;
@@ -561,6 +588,10 @@ namespace OpenRA.Editor
 		private System.Windows.Forms.ToolStripMenuItem showActorNamesToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem showGridToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem fixOpenAreasToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem setupDefaultPlayersMenuItem;
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.FlowLayoutPanel actorPalette;
+		private System.Windows.Forms.ComboBox actorOwnerChooser;
 
 	}
 }

OpenRA.Editor/Form1.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -56,6 +57,7 @@ namespace OpenRA.Editor
 
 			surface1.AfterChange += OnMapChanged;
 			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
+			surface1.ActorDoubleClicked += ActorDoubleClicked;
 
 			if (args.Length >= 2)
 				LoadMap(args[1]);
@@ -67,7 +69,31 @@ namespace OpenRA.Editor
 			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
 		}
 
+		void ActorDoubleClicked(KeyValuePair<string,ActorReference> kv)
+		{
+			using( var apd = new ActorPropertiesDialog() )
+			{
+				var name = kv.Key;
+				apd.AddRow("(Name)", apd.MakeEditorControl(typeof(string), () => name, v => name = (string)v));
+				apd.AddRow("(Type)", apd.MakeEditorControl(typeof(string), () => kv.Value.Type, v => kv.Value.Type = (string)v));
+
+				var objSaved = kv.Value.Save();
+
+				// TODO: make this work properly
+				foreach( var init in Rules.Info[kv.Value.Type].GetInitKeys() )
+					apd.AddRow(init.First,
+						apd.MakeEditorControl(init.Second,
+							() => objSaved.NodesDict.ContainsKey( init.First ) ? objSaved.NodesDict[init.First].Value : null,
+							_ => {}));
+
+				apd.ShowDialog();
+
+				// TODO: writeback
+			}
+		}
+
 		void MakeDirty() { dirty = true; }
+
 		string loadedMapName;
 		string currentMod = "ra";
 		TileSet tileset;
@@ -157,9 +183,9 @@ namespace OpenRA.Editor
 
 					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
 					if (etf != null && etf.ExcludeTilesets != null
-					    && etf.ExcludeTilesets.Contains(tileset.Id)) continue;
+						&& etf.ExcludeTilesets.Contains(tileset.Id)) continue;
 					if (etf != null && etf.RequireTilesets != null
-					    && !etf.RequireTilesets.Contains(tileset.Id)) continue;
+						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
 
 					var template = RenderUtils.RenderActor(info, tileset, palette);
 					var ibox = new PictureBox
@@ -233,6 +259,16 @@ namespace OpenRA.Editor
 			saveToolStripMenuItem.Enabled = true;
 			saveAsToolStripMenuItem.Enabled = true;
 			mnuMinimapToPNG.Enabled = true;	// todo: what is this VB naming bullshit doing here?
+
+			PopulateActorOwnerChooser();
+		}
+
+		void PopulateActorOwnerChooser()
+		{
+			actorOwnerChooser.Items.Clear();
+			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
+			actorOwnerChooser.SelectedIndex = 0;
+			surface1.NewActorOwner = (actorOwnerChooser.SelectedItem as PlayerReference).Name;
 		}
 
 		void ResizeClicked(object sender, EventArgs e)
@@ -408,11 +444,15 @@ namespace OpenRA.Editor
 
 		void ExportMinimap(object sender, EventArgs e)
 		{
-			saveFileDialog.InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps");
-			saveFileDialog.FileName = Path.ChangeExtension(loadedMapName, ".png");
-
-			if (DialogResult.OK == saveFileDialog.ShowDialog())
-				pmMiniMap.Image.Save(saveFileDialog.FileName);
+			using( var sfd = new SaveFileDialog() { 
+				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
+				DefaultExt = "*.png",
+				Filter = "PNG Image (*.png)|*.png",
+				Title = "Export Minimap to PNG",
+				FileName = Path.ChangeExtension(loadedMapName, ".png"),
+				RestoreDirectory = true } )
+				if (DialogResult.OK == sfd.ShowDialog())
+					pmMiniMap.Image.Save(sfd.FileName);
 		}
 
 		void ShowActorNamesClicked(object sender, EventArgs e)
@@ -447,5 +487,40 @@ namespace OpenRA.Editor
 			surface1.Chunks.Clear();
 			surface1.Invalidate();
 		}
+
+		void SetupDefaultPlayers(object sender, EventArgs e)
+		{
+			dirty = true;
+			surface1.Map.MakeDefaultPlayers();
+
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
+
+			PopulateActorOwnerChooser();
+		}
+
+		void onDrawPlayerItem(object sender, DrawItemEventArgs e)
+		{
+			// color block
+			var player = e.Index >= 0 ? (PlayerReference)(sender as ComboBox).Items[e.Index] : null;
+
+			e.DrawBackground();
+			e.DrawFocusRectangle();
+
+			if (player == null)
+				return;
+
+			var color = player.ColorRamp.GetColor(0);
+			using( var brush = new SolidBrush(color) )
+				e.Graphics.FillRectangle( brush, e.Bounds.Left + 2, e.Bounds.Top + 2, e.Bounds.Height + 6, e.Bounds.Height - 4 );
+			using( var foreBrush = new SolidBrush(e.ForeColor) )
+				e.Graphics.DrawString( player.Name, e.Font, foreBrush, e.Bounds.Left + e.Bounds.Height + 12, e.Bounds.Top );
+		}
+
+		void onSelectOwner(object sender, EventArgs e)
+		{
+			var player = actorOwnerChooser.SelectedItem as PlayerReference;
+			surface1.NewActorOwner = player.Name;
+		}
 	}
 }

OpenRA.Editor/LegacyMapImporter.cs

@@ -427,10 +427,10 @@ namespace OpenRA.Editor
 				NonCombatant = section == "Neutral",
 				Race = isRA ? (section == "BadGuy" ? "soviet" : "allies") : (section == "BadGuy" ? "nod" : "gdi"),
 				ColorRamp = new ColorRamp(
-                        (byte)((color.First.GetHue() / 360.0f) * 255),
-                        (byte)(color.First.GetSaturation() * 255),
-                        (byte)(color.First.GetBrightness() * 255),
-                        (byte)(color.Second.GetBrightness() * 255))
+						(byte)((color.First.GetHue() / 360.0f) * 255),
+						(byte)(color.First.GetSaturation() * 255),
+						(byte)(color.First.GetBrightness() * 255),
+						(byte)(color.Second.GetBrightness() * 255))
 			};
 
 			var Neutral = new [] {"Neutral"};

OpenRA.Editor/MapSelect.Designer.cs

@@ -10,33 +10,33 @@
 
 namespace OpenRA.Editor
 {
-    partial class MapSelect
-    {
-        /// <summary>
-        /// TODO
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+	partial class MapSelect
+	{
+		/// <summary>
+		/// TODO
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// TODO
-        /// </summary>
-        /// <param name="disposing">TODO</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
+		/// <summary>
+		/// TODO
+		/// </summary>
+		/// <param name="disposing">TODO</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
 
-        #region Код, автоматически созданный конструктором форм Windows
+		#region Код, автоматически созданный конструктором форм Windows
 
-        /// <summary>
-        /// TODO
-        /// </summary>
-        private void InitializeComponent()
-        {
+		/// <summary>
+		/// TODO
+		/// </summary>
+		private void InitializeComponent()
+		{
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
 			this.MapList = new System.Windows.Forms.ListView();
@@ -75,7 +75,7 @@ namespace OpenRA.Editor
 			//
 			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.colMapName});
+			this.colMapName});
 			this.MapList.FullRowSelect = true;
 			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
 			this.MapList.LargeImageList = this.MapIconsList;
@@ -353,33 +353,33 @@ namespace OpenRA.Editor
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        public System.Windows.Forms.ListView MapList;
-        public System.Windows.Forms.Button btnCancel;
-        public System.Windows.Forms.Button btnOk;
-        public System.Windows.Forms.Label lblNew;
-        public System.Windows.Forms.TextBox txtNew;
-        public System.Windows.Forms.ColumnHeader colMapName;
-        public System.Windows.Forms.ImageList MapIconsList;
-        public System.Windows.Forms.PictureBox pbMinimap;
-        public System.Windows.Forms.Panel pnlBottom;
-        public System.Windows.Forms.SplitContainer splitContainer1;
-        public System.Windows.Forms.Label lblMinimap;
-        public System.Windows.Forms.TextBox txtTheater;
-        public System.Windows.Forms.Label lblTheater;
-        public System.Windows.Forms.TextBox txtAuthor;
-        public System.Windows.Forms.Label lblAuthor;
-        public System.Windows.Forms.TextBox txtTitle;
-        public System.Windows.Forms.Label lblMapName;
-        public System.Windows.Forms.TextBox txtDesc;
-        public System.Windows.Forms.Label lblDesc;
-        public System.Windows.Forms.Label lblMapList;
-        public System.Windows.Forms.Label lblPathOut;
-        public System.Windows.Forms.Label lblPath;
-        public System.Windows.Forms.TextBox txtPathOut;
+		public System.Windows.Forms.ListView MapList;
+		public System.Windows.Forms.Button btnCancel;
+		public System.Windows.Forms.Button btnOk;
+		public System.Windows.Forms.Label lblNew;
+		public System.Windows.Forms.TextBox txtNew;
+		public System.Windows.Forms.ColumnHeader colMapName;
+		public System.Windows.Forms.ImageList MapIconsList;
+		public System.Windows.Forms.PictureBox pbMinimap;
+		public System.Windows.Forms.Panel pnlBottom;
+		public System.Windows.Forms.SplitContainer splitContainer1;
+		public System.Windows.Forms.Label lblMinimap;
+		public System.Windows.Forms.TextBox txtTheater;
+		public System.Windows.Forms.Label lblTheater;
+		public System.Windows.Forms.TextBox txtAuthor;
+		public System.Windows.Forms.Label lblAuthor;
+		public System.Windows.Forms.TextBox txtTitle;
+		public System.Windows.Forms.Label lblMapName;
+		public System.Windows.Forms.TextBox txtDesc;
+		public System.Windows.Forms.Label lblDesc;
+		public System.Windows.Forms.Label lblMapList;
+		public System.Windows.Forms.Label lblPathOut;
+		public System.Windows.Forms.Label lblPath;
+		public System.Windows.Forms.TextBox txtPathOut;
 		private System.Windows.Forms.PictureBox pictureBox1;
-    }
+	}
 }

OpenRA.Editor/MapSelect.cs

@@ -10,75 +10,73 @@
 
 using System;
 using System.IO;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
 using System.Linq;
+using System.Windows.Forms;
+using OpenRA.Graphics;
 
 namespace OpenRA.Editor
 {
-    public partial class MapSelect : Form
-    {
-        public string MapFolderPath;
+	public partial class MapSelect : Form
+	{
+		public string MapFolderPath;
 
-        public MapSelect(string currentMod)
-        {
-            MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+		public MapSelect(string currentMod)
+		{
+			MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
 				.Aggregate(Path.Combine);
 
 			InitializeComponent();
 			MapIconsList.Images.Add(pictureBox1.Image);
-        }
+		}
 
-        void MapSelect_Load(object sender, EventArgs e)
-        {
-            MapList.Items.Clear();
-            txtPathOut.Text = MapFolderPath;
+		void MapSelect_Load(object sender, EventArgs e)
+		{
+			MapList.Items.Clear();
+			txtPathOut.Text = MapFolderPath;
 
-            foreach (var map in ModData.FindMapsIn(MapFolderPath))
-            {
-                ListViewItem map1 = new ListViewItem();
+			foreach (var map in ModData.FindMapsIn(MapFolderPath))
+			{
+				ListViewItem map1 = new ListViewItem();
 				map1.Tag = map;
 				map1.Text = Path.GetFileNameWithoutExtension(map);
-                map1.ImageIndex = 0;
-                MapList.Items.Add(map1);
-            }
+				map1.ImageIndex = 0;
+				MapList.Items.Add(map1);
+			}
 
 			// hack
 			if (txtNew.Text != "unnamed")
-                MapList.Items[0].Selected = true;
-        }
+				MapList.Items[0].Selected = true;
+		}
 
-        void MapList_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (MapList.SelectedItems.Count == 1)
-            {
-                txtNew.Text = MapList.SelectedItems[0].Text;
+		void MapList_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (MapList.SelectedItems.Count == 1)
+			{
+				txtNew.Text = MapList.SelectedItems[0].Text;
 				txtNew.Tag = MapList.SelectedItems[0].Tag;
 
 				var map = new Map(txtNew.Tag as string);
-                txtTitle.Text = map.Title;
-                txtAuthor.Text = map.Author;
-                txtTheater.Text = map.Tileset;
-                txtDesc.Text = map.Description;
+				txtTitle.Text = map.Title;
+				txtAuthor.Text = map.Author;
+				txtTheater.Text = map.Tileset;
+				txtDesc.Text = map.Description;
 				pbMinimap.Image = null;
 
-                try
-                {
+				try
+				{
 					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
-                }
-                catch (Exception ed)
-                {
-                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
-                }
-                finally { }
-            }
-        }
+				}
+				catch (Exception ed)
+				{
+					Console.WriteLine("No map preview image found: {0}", ed.ToString());
+				}
+				finally { }
+			}
+		}
 
-        void txtPathOut_TextChanged(object sender, EventArgs e)
-        {
-            MapFolderPath = txtPathOut.Text;
-        }
-
-    }
+		void txtPathOut_TextChanged(object sender, EventArgs e)
+		{
+			MapFolderPath = txtPathOut.Text;
+		}
+	}
 }

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -110,118 +110,118 @@ namespace OpenRA.Editor
 			//
 			this.cordonBottom.Location = new System.Drawing.Point(280, 75);
 			this.cordonBottom.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonBottom.Name = "cordonBottom";
 			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
 			this.cordonBottom.TabIndex = 5;
 			this.cordonBottom.Value = new decimal(new int[] {
-            112,
-            0,
-            0,
-            0});
+			112,
+			0,
+			0,
+			0});
 			this.cordonBottom.Enter += new System.EventHandler(this.SelectText);
 			//
 			// cordonTop
 			//
 			this.cordonTop.Location = new System.Drawing.Point(280, 49);
 			this.cordonTop.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonTop.Name = "cordonTop";
 			this.cordonTop.Size = new System.Drawing.Size(105, 20);
 			this.cordonTop.TabIndex = 3;
 			this.cordonTop.Value = new decimal(new int[] {
-            16,
-            0,
-            0,
-            0});
+			16,
+			0,
+			0,
+			0});
 			this.cordonTop.Enter += new System.EventHandler(this.SelectText);
 			//
 			// cordonRight
 			//
 			this.cordonRight.Location = new System.Drawing.Point(169, 75);
 			this.cordonRight.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonRight.Name = "cordonRight";
 			this.cordonRight.Size = new System.Drawing.Size(105, 20);
 			this.cordonRight.TabIndex = 4;
 			this.cordonRight.Value = new decimal(new int[] {
-            112,
-            0,
-            0,
-            0});
+			112,
+			0,
+			0,
+			0});
 			this.cordonRight.Enter += new System.EventHandler(this.SelectText);
 			//
 			// cordonLeft
 			//
 			this.cordonLeft.Location = new System.Drawing.Point(169, 49);
 			this.cordonLeft.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonLeft.Name = "cordonLeft";
 			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
 			this.cordonLeft.TabIndex = 2;
 			this.cordonLeft.Value = new decimal(new int[] {
-            16,
-            0,
-            0,
-            0});
+			16,
+			0,
+			0,
+			0});
 			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
 			//
 			// height
 			//
 			this.height.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.height.Location = new System.Drawing.Point(280, 23);
 			this.height.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.height.Name = "height";
 			this.height.Size = new System.Drawing.Size(105, 20);
 			this.height.TabIndex = 1;
 			this.height.Value = new decimal(new int[] {
-            128,
-            0,
-            0,
-            0});
+			128,
+			0,
+			0,
+			0});
 			this.height.Enter += new System.EventHandler(this.SelectText);
 			//
 			// width
 			//
 			this.width.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.width.Location = new System.Drawing.Point(169, 23);
 			this.width.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.width.Name = "width";
 			this.width.Size = new System.Drawing.Size(105, 20);
 			this.width.TabIndex = 0;
 			this.width.Value = new decimal(new int[] {
-            128,
-            0,
-            0,
-            0});
+			128,
+			0,
+			0,
+			0});
 			this.width.Enter += new System.EventHandler(this.SelectText);
 			//
 			// label4

OpenRA.Editor/OpenRA.Editor.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -53,6 +53,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActorPropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ActorPropertiesDialog.Designer.cs">
+      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="ActorTemplate.cs" />
     <Compile Include="ActorTool.cs" />
     <Compile Include="BrushTool.cs" />
@@ -90,6 +96,9 @@
       <DependentUpon>PropertiesDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="ActorPropertiesDialog.resx">
+      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>

OpenRA.Editor/Program.cs

@@ -44,15 +44,15 @@ namespace OpenRA.Editor
 				.Aggregate(Path.Combine);
 
 			foreach (var path in ModData.FindMapsIn(MapFolderPath))
-            {
-                var map = new Map(path);
+			{
+				var map = new Map(path);
 				// Touch the lazy bits to initialize them
-                map.Actors.Force();
-                map.Smudges.Force();
-                map.MapTiles.Force();
-                map.MapResources.Force();
+				map.Actors.Force();
+				map.Smudges.Force();
+				map.MapTiles.Force();
+				map.MapResources.Force();
 				map.Save(path);
-            }
+			}
 		}
 
 	}

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -38,131 +38,131 @@ namespace OpenRA.Editor
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.button2 = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.title = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.desc = new System.Windows.Forms.TextBox();
-            this.selectable = new System.Windows.Forms.CheckBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.author = new System.Windows.Forms.TextBox();
-            this.useAsShellmap = new System.Windows.Forms.CheckBox();
-            this.SuspendLayout();
-            //
-            // button2
-            //
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.button2.Location = new System.Drawing.Point(196, 193);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(75, 23);
-            this.button2.TabIndex = 14;
-            this.button2.Text = "OK";
-            this.button2.UseVisualStyleBackColor = true;
-            //
-            // button1
-            //
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.button1.Location = new System.Drawing.Point(277, 193);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 15;
-            this.button1.Text = "Cancel";
-            this.button1.UseVisualStyleBackColor = true;
-            //
-            // label1
-            //
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 50);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(27, 13);
-            this.label1.TabIndex = 16;
-            this.label1.Text = "Title";
-            //
-            // title
-            //
-            this.title.Location = new System.Drawing.Point(66, 47);
-            this.title.Name = "title";
-            this.title.Size = new System.Drawing.Size(286, 20);
-            this.title.TabIndex = 17;
-            //
-            // label2
-            //
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 76);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(32, 13);
-            this.label2.TabIndex = 16;
-            this.label2.Text = "Desc";
-            //
-            // desc
-            //
-            this.desc.Location = new System.Drawing.Point(66, 73);
-            this.desc.Name = "desc";
-            this.desc.Size = new System.Drawing.Size(286, 20);
-            this.desc.TabIndex = 17;
-            //
-            // selectable
-            //
-            this.selectable.AutoSize = true;
-            this.selectable.Location = new System.Drawing.Point(118, 138);
-            this.selectable.Name = "selectable";
-            this.selectable.Size = new System.Drawing.Size(130, 17);
-            this.selectable.TabIndex = 18;
-            this.selectable.Text = "Show in Map Chooser";
-            this.selectable.UseVisualStyleBackColor = true;
-            //
-            // label3
-            //
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(12, 102);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(38, 13);
-            this.label3.TabIndex = 16;
-            this.label3.Text = "Author";
-            //
-            // author
-            //
-            this.author.Location = new System.Drawing.Point(66, 99);
-            this.author.Name = "author";
-            this.author.Size = new System.Drawing.Size(286, 20);
-            this.author.TabIndex = 17;
-            //
-            // checkBox1
-            //
-            this.useAsShellmap.AutoSize = true;
-            this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
-            this.useAsShellmap.Name = "checkBox1";
-            this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
-            this.useAsShellmap.TabIndex = 18;
-            this.useAsShellmap.Text = "Use as Shellmap";
-            this.useAsShellmap.UseVisualStyleBackColor = true;
-            //
-            // PropertiesDialog
-            //
-            this.AcceptButton = this.button2;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.button1;
-            this.ClientSize = new System.Drawing.Size(370, 228);
-            this.Controls.Add(this.useAsShellmap);
-            this.Controls.Add(this.selectable);
-            this.Controls.Add(this.author);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.desc);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.title);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.button1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Name = "PropertiesDialog";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "PropertiesDialog";
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.title = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.desc = new System.Windows.Forms.TextBox();
+			this.selectable = new System.Windows.Forms.CheckBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.author = new System.Windows.Forms.TextBox();
+			this.useAsShellmap = new System.Windows.Forms.CheckBox();
+			this.SuspendLayout();
+			//
+			// button2
+			//
+			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(196, 193);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 14;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			//
+			// button1
+			//
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(277, 193);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 15;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			//
+			// label1
+			//
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 50);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Title";
+			//
+			// title
+			//
+			this.title.Location = new System.Drawing.Point(66, 47);
+			this.title.Name = "title";
+			this.title.Size = new System.Drawing.Size(286, 20);
+			this.title.TabIndex = 17;
+			//
+			// label2
+			//
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 76);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(32, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Desc";
+			//
+			// desc
+			//
+			this.desc.Location = new System.Drawing.Point(66, 73);
+			this.desc.Name = "desc";
+			this.desc.Size = new System.Drawing.Size(286, 20);
+			this.desc.TabIndex = 17;
+			//
+			// selectable
+			//
+			this.selectable.AutoSize = true;
+			this.selectable.Location = new System.Drawing.Point(118, 138);
+			this.selectable.Name = "selectable";
+			this.selectable.Size = new System.Drawing.Size(130, 17);
+			this.selectable.TabIndex = 18;
+			this.selectable.Text = "Show in Map Chooser";
+			this.selectable.UseVisualStyleBackColor = true;
+			//
+			// label3
+			//
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 102);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(38, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Author";
+			//
+			// author
+			//
+			this.author.Location = new System.Drawing.Point(66, 99);
+			this.author.Name = "author";
+			this.author.Size = new System.Drawing.Size(286, 20);
+			this.author.TabIndex = 17;
+			//
+			// checkBox1
+			//
+			this.useAsShellmap.AutoSize = true;
+			this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
+			this.useAsShellmap.Name = "checkBox1";
+			this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
+			this.useAsShellmap.TabIndex = 18;
+			this.useAsShellmap.Text = "Use as Shellmap";
+			this.useAsShellmap.UseVisualStyleBackColor = true;
+			//
+			// PropertiesDialog
+			//
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(370, 228);
+			this.Controls.Add(this.useAsShellmap);
+			this.Controls.Add(this.selectable);
+			this.Controls.Add(this.author);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.desc);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.title);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "PropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Map Properties";
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -177,6 +177,6 @@ namespace OpenRA.Editor
 		public System.Windows.Forms.CheckBox selectable;
 		private System.Windows.Forms.Label label3;
 		public System.Windows.Forms.TextBox author;
-        public System.Windows.Forms.CheckBox useAsShellmap;
+		public System.Windows.Forms.CheckBox useAsShellmap;
 	}
-}
+}

OpenRA.Editor/RenderUtils.cs

@@ -45,9 +45,9 @@ namespace OpenRA.Editor
 
 		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
 		{
-            var image = RenderSimple.GetImage(info);
+			var image = RenderSimple.GetImage(info);
 
-            using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
 			{
 				var shp = new ShpReader(s);
 				var bitmap = RenderShp(shp, p);

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -60,16 +60,16 @@ namespace OpenRA.Editor
 			// width
 			//
 			this.width.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.width.Location = new System.Drawing.Point(161, 18);
 			this.width.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.width.Name = "width";
 			this.width.Size = new System.Drawing.Size(105, 20);
 			this.width.TabIndex = 0;
@@ -96,10 +96,10 @@ namespace OpenRA.Editor
 			//
 			this.cordonLeft.Location = new System.Drawing.Point(161, 44);
 			this.cordonLeft.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonLeft.Name = "cordonLeft";
 			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
 			this.cordonLeft.TabIndex = 0;
@@ -108,10 +108,10 @@ namespace OpenRA.Editor
 			//
 			this.cordonTop.Location = new System.Drawing.Point(272, 44);
 			this.cordonTop.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonTop.Name = "cordonTop";
 			this.cordonTop.Size = new System.Drawing.Size(105, 20);
 			this.cordonTop.TabIndex = 0;
@@ -120,10 +120,10 @@ namespace OpenRA.Editor
 			//
 			this.cordonRight.Location = new System.Drawing.Point(161, 70);
 			this.cordonRight.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonRight.Name = "cordonRight";
 			this.cordonRight.Size = new System.Drawing.Size(105, 20);
 			this.cordonRight.TabIndex = 0;
@@ -132,10 +132,10 @@ namespace OpenRA.Editor
 			//
 			this.cordonBottom.Location = new System.Drawing.Point(272, 70);
 			this.cordonBottom.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.cordonBottom.Name = "cordonBottom";
 			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
 			this.cordonBottom.TabIndex = 0;
@@ -172,16 +172,16 @@ namespace OpenRA.Editor
 			// height
 			//
 			this.height.Increment = new decimal(new int[] {
-            8,
-            0,
-            0,
-            0});
+			8,
+			0,
+			0,
+			0});
 			this.height.Location = new System.Drawing.Point(272, 18);
 			this.height.Maximum = new decimal(new int[] {
-            2048,
-            0,
-            0,
-            0});
+			2048,
+			0,
+			0,
+			0});
 			this.height.Name = "height";
 			this.height.Size = new System.Drawing.Size(105, 20);
 			this.height.TabIndex = 0;

OpenRA.Editor/Surface.cs

@@ -38,8 +38,11 @@ namespace OpenRA.Editor
 		public bool ShowActorNames;
 		public bool ShowGrid;
 
+		public string NewActorOwner;
+
 		public event Action AfterChange = () => { };
 		public event Action<string> MousePositionChanged = _ => { };
+		public event Action<KeyValuePair<string, ActorReference>> ActorDoubleClicked = _ => { };
 
 		Dictionary<string, ActorTemplate> ActorTemplates = new Dictionary<string, ActorTemplate>();
 		Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
@@ -89,6 +92,15 @@ namespace OpenRA.Editor
 			Invalidate();
 		}
 
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			base.OnDoubleClick(e);
+
+			var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
+			if (x.Key != null)
+				ActorDoubleClicked(x);
+		}
+
 		protected override void OnMouseWheel(MouseEventArgs e)
 		{
 			base.OnMouseWheel(e);
@@ -292,7 +304,7 @@ namespace OpenRA.Editor
 			if (cp != null) bmp.Palette = restorePalette;
 		}
 
-		void DrawActorBorder(System.Drawing.Graphics g, int2 p, ActorTemplate t)
+		void DrawActorBorder(SGraphics g, int2 p, ActorTemplate t)
 		{
 			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
 			var drawPos = GetDrawPosition(p, t.Bitmap, centered);
@@ -302,26 +314,31 @@ namespace OpenRA.Editor
 				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
 		}
 
-		ColorPalette GetPaletteForPlayer(string name)
+		ColorPalette GetPaletteForPlayerInner(string name)
 		{
 			var pr = Map.Players[name];
 			var pcpi = Rules.Info["player"].Traits.Get<PlayerColorPaletteInfo>();
-			var remap = new PlayerColorRemap(pr.ColorRamp, pcpi.PaletteFormat);
+			var remap = new PlayerColorRemap(pcpi.PaletteFormat, pr.ColorRamp);
 			return new Palette(Palette, remap).AsSystemPalette();
 		}
 
 		Cache<string, ColorPalette> PlayerPalettes;
 
-		ColorPalette GetPaletteForActor(ActorReference ar)
+		public ColorPalette GetPaletteForPlayer(string player)
 		{
 			if (PlayerPalettes == null)
-				PlayerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayer);
+				PlayerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayerInner);
 
+			return PlayerPalettes[player];
+		}
+
+		ColorPalette GetPaletteForActor(ActorReference ar)
+		{
 			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
 			if (ownerInit == null)
 				return null;
 
-			return PlayerPalettes[ownerInit.PlayerName];
+			return GetPaletteForPlayer(ownerInit.PlayerName);
 		}
 
 		protected override void OnPaint(PaintEventArgs e)

OpenRA.FileFormats/ColorRamp.cs

@@ -12,36 +12,36 @@ using System.Drawing;
 
 namespace OpenRA.FileFormats
 {
-    public struct ColorRamp
-    {
-        public byte H,S,L,R;
+	public struct ColorRamp
+	{
+		public byte H,S,L,R;
 
-        public ColorRamp(byte h, byte s, byte l, byte r)
-        {
-            H = h; S = s; L = l; R = r;
-        }
+		public ColorRamp(byte h, byte s, byte l, byte r)
+		{
+			H = h; S = s; L = l; R = r;
+		}
 
-        /* returns a color along the Lum ramp */
-        public Color GetColor( float t )
-        {
-            return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L / 255f, L*R / (255f * 255f), t ) );
-        }
+		public static readonly ColorRamp Empty = new ColorRamp(0,0,0,0);
 
-        public override string ToString()
-        {
-            return "{0},{1},{2},{3}".F(H, S, L, R);
-        }
+		/* returns a color along the Lum ramp */
+		public Color GetColor( float t )
+		{
+			return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L / 255f, L*R / (255f * 255f), t ) );
+		}
 
-        // hk is hue in the range [0,1] instead of [0,360]
+		public override string ToString()
+		{
+			return "{0},{1},{2},{3}".F(H, S, L, R);
+		}
+
+		// hk is hue in the range [0,1] instead of [0,360]
 		public static Color ColorFromHSL(float hk, float s, float l)
 		{
 			// Convert from HSL to RGB
 			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
 			var p = 2 * l - q;
 
-			float[] trgb = { hk + 1 / 3.0f,
-							  hk,
-							  hk - 1/3.0f };
+			float[] trgb = { hk + 1 / 3.0f, hk, hk - 1/3.0f };
 			float[] rgb = { 0, 0, 0 };
 
 			for (int k = 0; k < 3; k++)
@@ -60,5 +60,23 @@ namespace OpenRA.FileFormats
 
 			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
 		}
-    }
+
+		public static bool operator ==(ColorRamp me, ColorRamp other)
+		{
+			return (me.H == other.H && me.S == other.S && me.L == other.L && me.R == other.R );
+		}
+
+		public static bool operator !=(ColorRamp me, ColorRamp other) { return !(me == other); }
+
+		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode() ^ R.GetHashCode(); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			ColorRamp o = (ColorRamp)obj;
+			return o == this;
+		}
+	}
 }

OpenRA.FileFormats/Exts.cs

@@ -113,10 +113,10 @@ namespace OpenRA
 			return r.Contains(p.ToPointF());
 		}
 
-        public static bool HasModifier(this Modifiers k, Modifiers mod)
-        {
-            return (k & mod) == mod;
-        }
+		public static bool HasModifier(this Modifiers k, Modifiers mod)
+		{
+			return (k & mod) == mod;
+		}
 
 		public static bool IsValidInput(this KeyInput key)
 		{
@@ -125,36 +125,36 @@ namespace OpenRA
 					char.IsPunctuation(key.UnicodeChar);
 		}
 
-        public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
-            where V : new()
-        {
-            return d.GetOrAdd(k, _ => new V());
-        }
+		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
+			where V : new()
+		{
+			return d.GetOrAdd(k, _ => new V());
+		}
 
-        public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
-        {
-            V ret;
-            if (!d.TryGetValue(k, out ret))
-                d.Add(k, ret = createFn(k));
-            return ret;
-        }
+		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
+		{
+			V ret;
+			if (!d.TryGetValue(k, out ret))
+				d.Add(k, ret = createFn(k));
+			return ret;
+		}
 
-        public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
-        {
-            var xs = ts.ToArray();
-            return xs[r.Next(xs.Length)];
-        }
+		public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
+		{
+			var xs = ts.ToArray();
+			return xs[r.Next(xs.Length)];
+		}
 
-        public static float Product(this IEnumerable<float> xs)
-        {
-            return xs.Aggregate(1f, (a, x) => a * x);
-        }
+		public static float Product(this IEnumerable<float> xs)
+		{
+			return xs.Aggregate(1f, (a, x) => a * x);
+		}
 
-        public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> xs, IEnumerable<T> ys)
-        {
-            // this is probably a shockingly-slow way to do this, but it's concise.
-            return xs.Except(ys).Concat(ys.Except(xs));
-        }
+		public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> xs, IEnumerable<T> ys)
+		{
+			// this is probably a shockingly-slow way to do this, but it's concise.
+			return xs.Except(ys).Concat(ys.Except(xs));
+		}
 
 		public static IEnumerable<T> Iterate<T>( this T t, Func<T,T> f )
 		{
@@ -171,5 +171,15 @@ namespace OpenRA
 			++v;
 			return v;
 		}
+
+		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
+		{
+			return string.Join(j, ts.Select(t => t.ToString()).ToArray());
+		}
+
+		public static IEnumerable<T> Append<T>( this IEnumerable<T> ts, params T[] moreTs)
+		{
+			return ts.Concat(moreTs);
+		}
 	}
 }

OpenRA.FileFormats/FieldLoader.cs

@@ -143,63 +143,63 @@ namespace OpenRA.FileFormats
 				return InvalidValueAction(x,fieldType, field);
 			}
 
-            else if (fieldType == typeof(ColorRamp))
-            {
-                var parts = x.Split(',');
-                if (parts.Length == 4)
-                    return new ColorRamp(
-                        (byte)int.Parse(parts[0]).Clamp(0, 255),
-                        (byte)int.Parse(parts[1]).Clamp(0, 255),
-                        (byte)int.Parse(parts[2]).Clamp(0, 255),
-                        (byte)int.Parse(parts[3]).Clamp(0, 255));
+			else if (fieldType == typeof(ColorRamp))
+			{
+				var parts = x.Split(',');
+				if (parts.Length == 4)
+					return new ColorRamp(
+						(byte)int.Parse(parts[0]).Clamp(0, 255),
+						(byte)int.Parse(parts[1]).Clamp(0, 255),
+						(byte)int.Parse(parts[2]).Clamp(0, 255),
+						(byte)int.Parse(parts[3]).Clamp(0, 255));
 
-                return InvalidValueAction(x, fieldType, field);
-            }
+				return InvalidValueAction(x, fieldType, field);
+			}
 
-            else if (fieldType.IsEnum)
-            {
-                if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
-                    return InvalidValueAction(x, fieldType, field);
-                return Enum.Parse(fieldType, x, true);
-            }
+			else if (fieldType.IsEnum)
+			{
+				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+					return InvalidValueAction(x, fieldType, field);
+				return Enum.Parse(fieldType, x, true);
+			}
 
-            else if (fieldType == typeof(bool))
-                return ParseYesNo(x, fieldType, field);
+			else if (fieldType == typeof(bool))
+				return ParseYesNo(x, fieldType, field);
 
-            else if (fieldType.IsArray)
-            {
-                if (x == null)
-                    return Array.CreateInstance(fieldType.GetElementType(), 0);
+			else if (fieldType.IsArray)
+			{
+				if (x == null)
+					return Array.CreateInstance(fieldType.GetElementType(), 0);
 
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
-                var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-                for (int i = 0; i < parts.Length; i++)
-                    ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
-                return ret;
-            }
-            else if (fieldType == typeof(int2))
-            {
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
-            }
-            else if (fieldType == typeof(float2))
-            {
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                float xx = 0;
-                float yy = 0;
-                float res;
-                if (float.TryParse(parts[0].Replace("%", ""), out res))
-                    xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
-                if (float.TryParse(parts[1].Replace("%", ""), out res))
-                    yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
-                return new float2(xx, yy);
-            }
+				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+				for (int i = 0; i < parts.Length; i++)
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
+				return ret;
+			}
+			else if (fieldType == typeof(int2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+			}
+			else if (fieldType == typeof(float2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				float xx = 0;
+				float yy = 0;
+				float res;
+				if (float.TryParse(parts[0].Replace("%", ""), out res))
+					xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
+				if (float.TryParse(parts[1].Replace("%", ""), out res))
+					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
+				return new float2(xx, yy);
+			}
 			else if (fieldType == typeof(Rectangle))
-            {
-                var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                return new Rectangle(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
-            }
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new Rectangle(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
+			}
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
 			{
 				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
@@ -305,14 +305,13 @@ namespace OpenRA.FileFormats
 			return new MiniYamlNode(field, FieldSaver.FormatValue( o, o.GetType().GetField(field) ));
 		}
 
-		public static string FormatValue(object o, FieldInfo f)
+		public static string FormatValue(object v, Type t)
 		{
-			var v = f.GetValue(o);
 			if (v == null)
 				return "";
 
 			// Color.ToString() does the wrong thing; force it to format as an array
-			if (f.FieldType == typeof(Color))
+			if (t == typeof(Color))
 			{
 				var c = (Color)v;
 				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
@@ -321,20 +320,25 @@ namespace OpenRA.FileFormats
 					((int)c.B).Clamp(0, 255));
 			}
 
-			if (f.FieldType == typeof(Rectangle))
+			if (t == typeof(Rectangle))
 			{
 				var r = (Rectangle)v;
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
 
-			if (f.FieldType.IsArray)
+			if (t.IsArray)
 			{
 				var elems = ((Array)v).OfType<object>();
-				return string.Join(",", elems.Select(a => a.ToString()).ToArray());
+				return elems.JoinWith(",");
 			}
 
 			return v.ToString();
 		}
+
+		public static string FormatValue(object o, FieldInfo f)
+		{
+			return FormatValue(f.GetValue(o), f.FieldType);
+		}
 	}
 
 	public class FieldFromYamlKeyAttribute : Attribute { }

OpenRA.FileFormats/FileFormats/Blast.cs

@@ -182,13 +182,13 @@ namespace OpenRA.FileFormats
 	class BitReader
 	{
 		readonly byte[] src;
-        int offset = 0;
+		int offset = 0;
 		int bitBuffer = 0;
 		int bitCount = 0;
 
 		public BitReader(byte[] src)
 		{
-            this.src = src;
+			this.src = src;
 		}
 
 		public int ReadBits(int count)

OpenRA.FileFormats/FileFormats/BlowfishKeyProvider.cs

@@ -13,516 +13,516 @@ using System.Linq;
 
 namespace OpenRA.FileFormats
 {
-    /* possibly the fugliest C# i've ever seen. */
+	/* possibly the fugliest C# i've ever seen. */
 
-    class BlowfishKeyProvider
-    {
-        const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
+	class BlowfishKeyProvider
+	{
+		const string pubkeyStr = "AihRvNoIbTn85FZRYNZRcT+i6KpU+maCsEqr3Q5q+LDB5tH7Tz2qQ38V";
 
-        static sbyte[] char2num = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-    -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-    -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+		static sbyte[] char2num = {
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+	52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+	-1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+	15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+	-1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+	41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 
-        class PublicKey
-        {
-            public uint[] key1 = new uint[64];
-            public uint[] key2 = new uint[64];
-            public uint len;
-        }
-        PublicKey pubkey = new PublicKey();
+		class PublicKey
+		{
+			public uint[] key1 = new uint[64];
+			public uint[] key2 = new uint[64];
+			public uint len;
+		}
+		PublicKey pubkey = new PublicKey();
 
-        uint[] glob1 = new uint[64];
-        uint glob1_bitlen, glob1_len_x2;
-        uint[] glob2 = new uint[130];
-        uint[] glob1_hi = new uint[4];
-        uint[] glob1_hi_inv = new uint[4];
-        uint glob1_hi_bitlen;
-        uint glob1_hi_inv_lo, glob1_hi_inv_hi;
+		uint[] glob1 = new uint[64];
+		uint glob1_bitlen, glob1_len_x2;
+		uint[] glob2 = new uint[130];
+		uint[] glob1_hi = new uint[4];
+		uint[] glob1_hi_inv = new uint[4];
+		uint glob1_hi_bitlen;
+		uint glob1_hi_inv_lo, glob1_hi_inv_hi;
 
-        void init_bignum(uint[] n, uint val, uint len)
-        {
-            for (int i = 0; i < len; i++) n[i] = 0;
-            n[0] = val;
-        }
+		void init_bignum(uint[] n, uint val, uint len)
+		{
+			for (int i = 0; i < len; i++) n[i] = 0;
+			n[0] = val;
+		}
 
-        void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
-        {
-            byte sign;
+		void move_key_to_big(uint[] n, byte[] key, uint klen, uint blen)
+		{
+			byte sign;
 
-            if ((key[0] & 0x80) != 0) sign = 0xff;
-            else sign = 0;
+			if ((key[0] & 0x80) != 0) sign = 0xff;
+			else sign = 0;
 
-            unsafe
-            {
-                fixed (uint* _pn = &n[0])
-                {
-                    byte* pn = (byte*)_pn;
-                    uint i = blen * 4;
-                    for (; i > klen; i--) pn[i - 1] = (byte)sign;
-                    for (; i > 0; i--) pn[i - 1] = key[klen - i];
-                }
-            }
-        }
+			unsafe
+			{
+				fixed (uint* _pn = &n[0])
+				{
+					byte* pn = (byte*)_pn;
+					uint i = blen * 4;
+					for (; i > klen; i--) pn[i - 1] = (byte)sign;
+					for (; i > 0; i--) pn[i - 1] = key[klen - i];
+				}
+			}
+		}
 
-        void key_to_bignum(uint[] n, byte[] key, uint len)
-        {
-            uint keylen;
-            int i;
+		void key_to_bignum(uint[] n, byte[] key, uint len)
+		{
+			uint keylen;
+			int i;
 
-            int j = 0;
+			int j = 0;
 
-            if (key[j] != 2) return;
-            j++;
+			if (key[j] != 2) return;
+			j++;
 
-            if ((key[j] & 0x80) != 0)
-            {
-                keylen = 0;
-                for (i = 0; i < (key[j] & 0x7f); i++) keylen = (keylen << 8) | key[j + i + 1];
-                j += (key[j] & 0x7f) + 1;
-            }
-            else
-            {
-                keylen = key[j];
-                j++;
-            }
-            if (keylen <= len * 4)
-                move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
-        }
+			if ((key[j] & 0x80) != 0)
+			{
+				keylen = 0;
+				for (i = 0; i < (key[j] & 0x7f); i++) keylen = (keylen << 8) | key[j + i + 1];
+				j += (key[j] & 0x7f) + 1;
+			}
+			else
+			{
+				keylen = key[j];
+				j++;
+			}
+			if (keylen <= len * 4)
+				move_key_to_big(n, key.Skip(j).ToArray(), keylen, len);
+		}
 
-        uint len_bignum(uint[] n, uint len)
-        {
-            uint i;
-            i = len - 1;
-            while ((i >= 0) && (n[i] == 0)) i--;
-            return i + 1;
-        }
+		uint len_bignum(uint[] n, uint len)
+		{
+			uint i;
+			i = len - 1;
+			while ((i >= 0) && (n[i] == 0)) i--;
+			return i + 1;
+		}
 
-        uint bitlen_bignum(uint[] n, uint len)
-        {
-            uint ddlen, bitlen, mask;
-            ddlen = len_bignum(n, len);
-            if (ddlen == 0) return 0;
-            bitlen = ddlen * 32;
-            mask = 0x80000000;
-            while ((mask & n[ddlen - 1]) == 0)
-            {
-                mask >>= 1;
-                bitlen--;
-            }
-            return bitlen;
-        }
+		uint bitlen_bignum(uint[] n, uint len)
+		{
+			uint ddlen, bitlen, mask;
+			ddlen = len_bignum(n, len);
+			if (ddlen == 0) return 0;
+			bitlen = ddlen * 32;
+			mask = 0x80000000;
+			while ((mask & n[ddlen - 1]) == 0)
+			{
+				mask >>= 1;
+				bitlen--;
+			}
+			return bitlen;
+		}
 
-        void init_pubkey()
-        {
-            int i = 0;
-            uint i2, tmp;
-            byte[] keytmp = new byte[256];
+		void init_pubkey()
+		{
+			int i = 0;
+			uint i2, tmp;
+			byte[] keytmp = new byte[256];
 
-            init_bignum(pubkey.key2, 0x10001, 64);
+			init_bignum(pubkey.key2, 0x10001, 64);
 
-            i2 = 0;
-            while (i < pubkeyStr.Length)
-            {
-                tmp = (uint)char2num[pubkeyStr[i++]];
-                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
-                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
-                tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
-                keytmp[i2++] = (byte)((tmp >> 16) & 0xff);
-                keytmp[i2++] = (byte)((tmp >> 8) & 0xff);
-                keytmp[i2++] = (byte)(tmp & 0xff);
-            }
+			i2 = 0;
+			while (i < pubkeyStr.Length)
+			{
+				tmp = (uint)char2num[pubkeyStr[i++]];
+				tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+				tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+				tmp <<= 6; tmp |= (uint)(byte)char2num[pubkeyStr[i++]];
+				keytmp[i2++] = (byte)((tmp >> 16) & 0xff);
+				keytmp[i2++] = (byte)((tmp >> 8) & 0xff);
+				keytmp[i2++] = (byte)(tmp & 0xff);
+			}
 
-            key_to_bignum(pubkey.key1, keytmp, 64);
-            pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
-        }
+			key_to_bignum(pubkey.key1, keytmp, 64);
+			pubkey.len = bitlen_bignum(pubkey.key1, 64) - 1;
+		}
 
-        uint len_predata()
-        {
-            uint a = (pubkey.len - 1) / 8;
-            return (55 / a + 1) * (a + 1);
-        }
+		uint len_predata()
+		{
+			uint a = (pubkey.len - 1) / 8;
+			return (55 / a + 1) * (a + 1);
+		}
 
-        int cmp_bignum(uint[] n1, uint[] n2, uint len)
-        {
+		int cmp_bignum(uint[] n1, uint[] n2, uint len)
+		{
 
-            while (len > 0)
-            {
-                --len;
-                if (n1[len] < n2[len]) return -1;
-                if (n1[len] > n2[len]) return 1;
-            }
-            return 0;
-        }
+			while (len > 0)
+			{
+				--len;
+				if (n1[len] < n2[len]) return -1;
+				if (n1[len] > n2[len]) return 1;
+			}
+			return 0;
+		}
 
-        void mov_bignum(uint[] dest, uint[] src, uint len)
-        {
-            Array.Copy(src, dest, len);
-        }
+		void mov_bignum(uint[] dest, uint[] src, uint len)
+		{
+			Array.Copy(src, dest, len);
+		}
 
-        void shr_bignum(uint[] n, int bits, int len)
-        {
-            int i; int i2 = bits / 32;
+		void shr_bignum(uint[] n, int bits, int len)
+		{
+			int i; int i2 = bits / 32;
 
-            if (i2 > 0)
-            {
-                for (i = 0; i < len - i2; i++) n[i] = n[i + i2];
-                for (; i < len; i++) n[i] = 0;
-                bits = bits % 32;
-            }
-            if (bits == 0) return;
-            for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
-          bits));
-            n[i] = n[i] >> bits;
-        }
+			if (i2 > 0)
+			{
+				for (i = 0; i < len - i2; i++) n[i] = n[i + i2];
+				for (; i < len; i++) n[i] = 0;
+				bits = bits % 32;
+			}
+			if (bits == 0) return;
+			for (i = 0; i < len - 1; i++) n[i] = (n[i] >> bits) | (n[i + 1] << (32 -
+		  bits));
+			n[i] = n[i] >> bits;
+		}
 
-        void shl_bignum(uint[] n, int bits, int len)
-        {
-            int i, i2;
+		void shl_bignum(uint[] n, int bits, int len)
+		{
+			int i, i2;
 
-            i2 = bits / 32;
-            if (i2 > 0)
-            {
-                for (i = len - 1; i > i2; i--) n[i] = n[i - i2];
-                for (; i > 0; i--) n[i] = 0;
-                bits = bits % 32;
-            }
-            if (bits == 0) return;
-            for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
-          bits));
-            n[0] <<= bits;
-        }
+			i2 = bits / 32;
+			if (i2 > 0)
+			{
+				for (i = len - 1; i > i2; i--) n[i] = n[i - i2];
+				for (; i > 0; i--) n[i] = 0;
+				bits = bits % 32;
+			}
+			if (bits == 0) return;
+			for (i = len - 1; i > 0; i--) n[i] = (n[i] << bits) | (n[i - 1] >> (32 -
+		  bits));
+			n[0] <<= bits;
+		}
 
-        uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
-        {
-            uint i1, i2;
+		uint sub_bignum(uint[] dest, uint[] src1, uint[] src2, uint carry, int len)
+		{
+			uint i1, i2;
 
-            len += len;
-            unsafe
-            {
-                fixed (uint* _ps1 = &src1[0])
-                fixed (uint* _ps2 = &src2[0])
-                fixed (uint* _pd = &dest[0])
-                {
-                    ushort* ps1 = (ushort*)_ps1;
-                    ushort* ps2 = (ushort*)_ps2;
-                    ushort* pd = (ushort*)_pd;
+			len += len;
+			unsafe
+			{
+				fixed (uint* _ps1 = &src1[0])
+				fixed (uint* _ps2 = &src2[0])
+				fixed (uint* _pd = &dest[0])
+				{
+					ushort* ps1 = (ushort*)_ps1;
+					ushort* ps2 = (ushort*)_ps2;
+					ushort* pd = (ushort*)_pd;
 
-                    while (--len != -1)
-                    {
-                        i1 = *ps1++;
-                        i2 = *ps2++;
-                        *pd++ = (ushort)(i1 - i2 - carry);
-                        if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
-                    }
-                }
-            }
-            return carry;
-        }
+					while (--len != -1)
+					{
+						i1 = *ps1++;
+						i2 = *ps2++;
+						*pd++ = (ushort)(i1 - i2 - carry);
+						if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+					}
+				}
+			}
+			return carry;
+		}
 
-        unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
-        {
-            uint i1, i2;
+		unsafe uint sub_bignum(uint* dest, uint* src1, uint* src2, uint carry, int len)
+		{
+			uint i1, i2;
 
-            len += len;
+			len += len;
 
-            ushort* ps1 = (ushort*)src1;
-            ushort* ps2 = (ushort*)src2;
-            ushort* pd = (ushort*)dest;
+			ushort* ps1 = (ushort*)src1;
+			ushort* ps2 = (ushort*)src2;
+			ushort* pd = (ushort*)dest;
 
-            while (--len != -1)
-            {
-                i1 = *ps1++;
-                i2 = *ps2++;
-                *pd++ = (ushort)(i1 - i2 - carry);
-                if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
+			while (--len != -1)
+			{
+				i1 = *ps1++;
+				i2 = *ps2++;
+				*pd++ = (ushort)(i1 - i2 - carry);
+				if (((i1 - i2 - carry) & 0x10000) != 0) carry = 1; else carry = 0;
 
-            }
-            return carry;
-        }
+			}
+			return carry;
+		}
 
-        void inv_bignum(uint[] n1, uint[] n2, uint len)
-        {
-            uint[] n_tmp = new uint[64];
-            uint n2_bytelen, bit;
-            int n2_bitlen;
+		void inv_bignum(uint[] n1, uint[] n2, uint len)
+		{
+			uint[] n_tmp = new uint[64];
+			uint n2_bytelen, bit;
+			int n2_bitlen;
 
-            int j = 0;
+			int j = 0;
 
-            init_bignum(n_tmp, 0, len);
-            init_bignum(n1, 0, len);
-            n2_bitlen = (int)bitlen_bignum(n2, len);
-            bit = ((uint)1) << (n2_bitlen % 32);
-            j = ((n2_bitlen + 32) / 32) - 1;
-            n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
-            n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
+			init_bignum(n_tmp, 0, len);
+			init_bignum(n1, 0, len);
+			n2_bitlen = (int)bitlen_bignum(n2, len);
+			bit = ((uint)1) << (n2_bitlen % 32);
+			j = ((n2_bitlen + 32) / 32) - 1;
+			n2_bytelen = (uint)((n2_bitlen - 1) / 32) * 4;
+			n_tmp[n2_bytelen / 4] |= ((uint)1) << ((n2_bitlen - 1) & 0x1f);
 
-            while (n2_bitlen > 0)
-            {
-                n2_bitlen--;
-                shl_bignum(n_tmp, 1, (int)len);
-                if (cmp_bignum(n_tmp, n2, len) != -1)
-                {
-                    sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
-                    n1[j] |= bit;
-                }
-                bit >>= 1;
-                if (bit == 0)
-                {
-                    j--;
-                    bit = 0x80000000;
-                }
-            }
-            init_bignum(n_tmp, 0, len);
-        }
+			while (n2_bitlen > 0)
+			{
+				n2_bitlen--;
+				shl_bignum(n_tmp, 1, (int)len);
+				if (cmp_bignum(n_tmp, n2, len) != -1)
+				{
+					sub_bignum(n_tmp, n_tmp, n2, 0, (int)len);
+					n1[j] |= bit;
+				}
+				bit >>= 1;
+				if (bit == 0)
+				{
+					j--;
+					bit = 0x80000000;
+				}
+			}
+			init_bignum(n_tmp, 0, len);
+		}
 
-        void inc_bignum(uint[] n, uint len)
-        {
-            int i = 0;
-            while ((++n[i] == 0) && (--len > 0)) i++;
-        }
+		void inc_bignum(uint[] n, uint len)
+		{
+			int i = 0;
+			while ((++n[i] == 0) && (--len > 0)) i++;
+		}
 
-        void init_two_dw(uint[] n, uint len)
-        {
-            mov_bignum(glob1, n, len);
-            glob1_bitlen = bitlen_bignum(glob1, len);
-            glob1_len_x2 = (glob1_bitlen + 15) / 16;
-            mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
-            glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
-            shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
-            inv_bignum(glob1_hi_inv, glob1_hi, 2);
-            shr_bignum(glob1_hi_inv, 1, 2);
-            glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
-            inc_bignum(glob1_hi_inv, 2);
-            if (bitlen_bignum(glob1_hi_inv, 2) > 32)
-            {
-                shr_bignum(glob1_hi_inv, 1, 2);
-                glob1_hi_bitlen--;
-            }
-            glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
-            glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
-        }
+		void init_two_dw(uint[] n, uint len)
+		{
+			mov_bignum(glob1, n, len);
+			glob1_bitlen = bitlen_bignum(glob1, len);
+			glob1_len_x2 = (glob1_bitlen + 15) / 16;
+			mov_bignum(glob1_hi, glob1.Skip((int)len_bignum(glob1, len) - 2).ToArray(), 2);
+			glob1_hi_bitlen = bitlen_bignum(glob1_hi, 2) - 32;
+			shr_bignum(glob1_hi, (int)glob1_hi_bitlen, 2);
+			inv_bignum(glob1_hi_inv, glob1_hi, 2);
+			shr_bignum(glob1_hi_inv, 1, 2);
+			glob1_hi_bitlen = (glob1_hi_bitlen + 15) % 16 + 1;
+			inc_bignum(glob1_hi_inv, 2);
+			if (bitlen_bignum(glob1_hi_inv, 2) > 32)
+			{
+				shr_bignum(glob1_hi_inv, 1, 2);
+				glob1_hi_bitlen--;
+			}
+			glob1_hi_inv_lo = (ushort)glob1_hi_inv[0];
+			glob1_hi_inv_hi = (ushort)(glob1_hi_inv[0] >> 16);
+		}
 
-        unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
-        {
-            uint i, tmp;
-            unsafe
-            {
-                fixed (uint* _pn2 = &n2[0])
-                {
-                    ushort* pn2 = (ushort*)_pn2;
+		unsafe void mul_bignum_word(ushort *pn1, uint[] n2, uint mul, uint len)
+		{
+			uint i, tmp;
+			unsafe
+			{
+				fixed (uint* _pn2 = &n2[0])
+				{
+					ushort* pn2 = (ushort*)_pn2;
 
-                    tmp = 0;
-                    for (i = 0; i < len; i++)
-                    {
-                        tmp = mul * (*pn2) + (*pn1) + tmp;
-                        *pn1 = (ushort)tmp;
-                        pn1++;
-                        pn2++;
-                        tmp >>= 16;
-                    }
-                    *pn1 += (ushort)tmp;
-                }
-            }
-        }
+					tmp = 0;
+					for (i = 0; i < len; i++)
+					{
+						tmp = mul * (*pn2) + (*pn1) + tmp;
+						*pn1 = (ushort)tmp;
+						pn1++;
+						pn2++;
+						tmp >>= 16;
+					}
+					*pn1 += (ushort)tmp;
+				}
+			}
+		}
 
-        void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
-        {
-          uint i;
+		void mul_bignum(uint[] dest, uint[] src1, uint[] src2, uint len)
+		{
+		  uint i;
 
-          unsafe
-          {
-              fixed( uint * _psrc2 = &src2[0] )
-              fixed(uint* _pdest = &dest[0])
-              {
-                  ushort* psrc2 = (ushort*)_psrc2;
-                  ushort* pdest = (ushort*)_pdest;
+		  unsafe
+		  {
+			  fixed( uint * _psrc2 = &src2[0] )
+			  fixed(uint* _pdest = &dest[0])
+			  {
+				  ushort* psrc2 = (ushort*)_psrc2;
+				  ushort* pdest = (ushort*)_pdest;
 
-                  init_bignum(dest, 0, len * 2);
-                  for (i = 0; i < len * 2; i++)
-                      mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
-              }
-          }
-        }
+				  init_bignum(dest, 0, len * 2);
+				  for (i = 0; i < len * 2; i++)
+					  mul_bignum_word(pdest++, src1, *psrc2++, len * 2);
+			  }
+		  }
+		}
 
-        void not_bignum(uint[] n, uint len)
-        {
-          uint i;
-          for (i = 0; i < len; i++) n[i] = ~n[i];
-        }
+		void not_bignum(uint[] n, uint len)
+		{
+		  uint i;
+		  for (i = 0; i < len; i++) n[i] = ~n[i];
+		}
 
-        void neg_bignum(uint[] n, uint len)
-        {
-          not_bignum(n, len);
-          inc_bignum(n, len);
-        }
+		void neg_bignum(uint[] n, uint len)
+		{
+		  not_bignum(n, len);
+		  inc_bignum(n, len);
+		}
 
-        unsafe uint get_mulword(uint* n)
-        {
-            ushort* wn = (ushort*)n;
-            uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
-                 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
-                 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
-                 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
-                 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
-            if (i > 0xffff) i = 0xffff;
-            return i & 0xffff;
-        }
+		unsafe uint get_mulword(uint* n)
+		{
+			ushort* wn = (ushort*)n;
+			uint i = (uint)((((((((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_lo + 0x10000) >> 1)
+				 + (((*(wn - 2) ^ 0xffff) * glob1_hi_inv_hi + glob1_hi_inv_hi) >> 1) + 1)
+				 >> 16) + ((((*(wn - 1) ^ 0xffff) & 0xffff) * glob1_hi_inv_hi) >> 1) +
+				 (((*wn ^ 0xffff) * glob1_hi_inv_lo) >> 1) + 1) >> 14) + glob1_hi_inv_hi
+				 * (*wn ^ 0xffff) * 2) >> (int)glob1_hi_bitlen);
+			if (i > 0xffff) i = 0xffff;
+			return i & 0xffff;
+		}
 
-        void dec_bignum(uint[] n, uint len)
-        {
-            int i = 0;
-            while ((--n[i] == 0xffffffff) && (--len > 0))
-                i++;
-        }
+		void dec_bignum(uint[] n, uint len)
+		{
+			int i = 0;
+			while ((--n[i] == 0xffffffff) && (--len > 0))
+				i++;
+		}
 
-        void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
-        {
-            uint g2_len_x2, len_diff;
-            unsafe
-            {
-                fixed( uint* g1 = &glob1[0])
-                fixed (uint* g2 = &glob2[0])
-                {
-                    mul_bignum(glob2, n2, n3, len);
-                    glob2[len * 2] = 0;
-                    g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
-                    if (g2_len_x2 >= glob1_len_x2)
-                    {
-                        inc_bignum(glob2, len * 2 + 1);
-                        neg_bignum(glob2, len * 2 + 1);
-                        len_diff = g2_len_x2 + 1 - glob1_len_x2;
-                        ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
-                        ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
-                        for (; len_diff != 0; len_diff--)
-                        {
-                            edi--;
-                            uint tmp = get_mulword((uint*)edi);
-                            esi--;
-                            if (tmp > 0)
-                            {
-                                mul_bignum_word(esi, glob1, tmp, 2 * len);
-                                if ((*edi & 0x8000) == 0)
-                                {
-                                    if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
-                                }
-                            }
-                        }
-                        neg_bignum(glob2, len);
-                        dec_bignum(glob2, len);
-                    }
-                    mov_bignum(n1, glob2, len);
-                }
-            }
-        }
+		void calc_a_bignum(uint[] n1, uint[] n2, uint[] n3, uint len)
+		{
+			uint g2_len_x2, len_diff;
+			unsafe
+			{
+				fixed( uint* g1 = &glob1[0])
+				fixed (uint* g2 = &glob2[0])
+				{
+					mul_bignum(glob2, n2, n3, len);
+					glob2[len * 2] = 0;
+					g2_len_x2 = len_bignum(glob2, len * 2 + 1) * 2;
+					if (g2_len_x2 >= glob1_len_x2)
+					{
+						inc_bignum(glob2, len * 2 + 1);
+						neg_bignum(glob2, len * 2 + 1);
+						len_diff = g2_len_x2 + 1 - glob1_len_x2;
+						ushort* esi = ((ushort*)g2) + (1 + g2_len_x2 - glob1_len_x2);
+						ushort* edi = ((ushort*)g2) + (g2_len_x2 + 1);
+						for (; len_diff != 0; len_diff--)
+						{
+							edi--;
+							uint tmp = get_mulword((uint*)edi);
+							esi--;
+							if (tmp > 0)
+							{
+								mul_bignum_word(esi, glob1, tmp, 2 * len);
+								if ((*edi & 0x8000) == 0)
+								{
+									if (0 != sub_bignum((uint*)esi, (uint*)esi, g1, 0, (int)len)) (*edi)--;
+								}
+							}
+						}
+						neg_bignum(glob2, len);
+						dec_bignum(glob2, len);
+					}
+					mov_bignum(n1, glob2, len);
+				}
+			}
+		}
 
-        void clear_tmp_vars(uint len)
-        {
-            init_bignum(glob1, 0, len);
-            init_bignum(glob2, 0, len);
-            init_bignum(glob1_hi_inv, 0, 4);
-            init_bignum(glob1_hi, 0, 4);
-            glob1_bitlen = 0;
-            glob1_hi_bitlen = 0;
-            glob1_len_x2 = 0;
-            glob1_hi_inv_lo = 0;
-            glob1_hi_inv_hi = 0;
-        }
+		void clear_tmp_vars(uint len)
+		{
+			init_bignum(glob1, 0, len);
+			init_bignum(glob2, 0, len);
+			init_bignum(glob1_hi_inv, 0, 4);
+			init_bignum(glob1_hi, 0, 4);
+			glob1_bitlen = 0;
+			glob1_hi_bitlen = 0;
+			glob1_len_x2 = 0;
+			glob1_hi_inv_lo = 0;
+			glob1_hi_inv_hi = 0;
+		}
 
-        void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
-        {
-            uint[] n_tmp = new uint[64];
-            uint n3_len, n4_len;
-            int n3_bitlen;
-            uint bit_mask;
+		void calc_a_key(uint[] n1, uint[] n2, uint[] n3, uint[] n4, uint len)
+		{
+			uint[] n_tmp = new uint[64];
+			uint n3_len, n4_len;
+			int n3_bitlen;
+			uint bit_mask;
 
-            unsafe
-            {
-                fixed (uint* _pn3 = &n3[0])
-                {
-                    uint* pn3 = _pn3;
+			unsafe
+			{
+				fixed (uint* _pn3 = &n3[0])
+				{
+					uint* pn3 = _pn3;
 
-                    init_bignum(n1, 1, len);
-                    n4_len = len_bignum(n4, len);
-                    init_two_dw(n4, n4_len);
-                    n3_bitlen = (int)bitlen_bignum(n3, n4_len);
-                    n3_len = (uint)((n3_bitlen + 31) / 32);
-                    bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
-                    pn3 += n3_len - 1;
-                    n3_bitlen--;
-                    mov_bignum(n1, n2, n4_len);
-                    while (--n3_bitlen != -1)
-                    {
-                        if (bit_mask == 0)
-                        {
-                            bit_mask = 0x80000000;
-                            pn3--;
-                        }
-                        calc_a_bignum(n_tmp, n1, n1, n4_len);
-                        if ((*pn3 & bit_mask) != 0)
-                            calc_a_bignum(n1, n_tmp, n2, n4_len);
-                        else
-                            mov_bignum(n1, n_tmp, n4_len);
-                        bit_mask >>= 1;
-                    }
-                    init_bignum(n_tmp, 0, n4_len);
-                    clear_tmp_vars(len);
-                }
-            }
-        }
+					init_bignum(n1, 1, len);
+					n4_len = len_bignum(n4, len);
+					init_two_dw(n4, n4_len);
+					n3_bitlen = (int)bitlen_bignum(n3, n4_len);
+					n3_len = (uint)((n3_bitlen + 31) / 32);
+					bit_mask = (((uint)1) << ((n3_bitlen - 1) % 32)) >> 1;
+					pn3 += n3_len - 1;
+					n3_bitlen--;
+					mov_bignum(n1, n2, n4_len);
+					while (--n3_bitlen != -1)
+					{
+						if (bit_mask == 0)
+						{
+							bit_mask = 0x80000000;
+							pn3--;
+						}
+						calc_a_bignum(n_tmp, n1, n1, n4_len);
+						if ((*pn3 & bit_mask) != 0)
+							calc_a_bignum(n1, n_tmp, n2, n4_len);
+						else
+							mov_bignum(n1, n_tmp, n4_len);
+						bit_mask >>= 1;
+					}
+					init_bignum(n_tmp, 0, n4_len);
+					clear_tmp_vars(len);
+				}
+			}
+		}
 
-        unsafe void memcpy(byte* dest, byte* src, int len)
-        {
-            while (len-- != 0) *dest++ = *src++;
-        }
+		unsafe void memcpy(byte* dest, byte* src, int len)
+		{
+			while (len-- != 0) *dest++ = *src++;
+		}
 
-        unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
-        {
-            uint[] n2 = new uint[64];
-            uint[] n3 = new uint[64];
+		unsafe void process_predata(byte* pre, uint pre_len, byte *buf)
+		{
+			uint[] n2 = new uint[64];
+			uint[] n3 = new uint[64];
 
-            uint a = (pubkey.len - 1) / 8;
-            while (a + 1 <= pre_len)
-            {
-                init_bignum(n2, 0, 64);
-                fixed( uint * pn2 = &n2[0] )
-                    memcpy((byte *)pn2, pre, (int)a + 1);
-                calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
+			uint a = (pubkey.len - 1) / 8;
+			while (a + 1 <= pre_len)
+			{
+				init_bignum(n2, 0, 64);
+				fixed( uint * pn2 = &n2[0] )
+					memcpy((byte *)pn2, pre, (int)a + 1);
+				calc_a_key(n3, n2, pubkey.key2, pubkey.key1, 64);
 
-                fixed( uint * pn3 = &n3[0] )
-                    memcpy(buf, (byte *)pn3, (int)a);
+				fixed( uint * pn3 = &n3[0] )
+					memcpy(buf, (byte *)pn3, (int)a);
 
-                pre_len -= a + 1;
-                pre += a + 1;
-                buf += a;
-            }
-        }
+				pre_len -= a + 1;
+				pre += a + 1;
+				buf += a;
+			}
+		}
 
-        public byte[] DecryptKey(byte[] src)
-        {
-            init_pubkey();
-            byte[] dest = new byte[256];
+		public byte[] DecryptKey(byte[] src)
+		{
+			init_pubkey();
+			byte[] dest = new byte[256];
 
-            unsafe
-            {
-                fixed (byte* pdest = &dest[0])
-                fixed (byte* psrc = &src[0])
-                    process_predata(psrc, len_predata(), pdest);
-            }
-            return dest.Take(56).ToArray();
-        }
-    }
+			unsafe
+			{
+				fixed (byte* pdest = &dest[0])
+				fixed (byte* psrc = &src[0])
+					process_predata(psrc, len_predata(), pdest);
+			}
+			return dest.Take(56).ToArray();
+		}
+	}
 }

OpenRA.FileFormats/FileFormats/Format40.cs

@@ -14,20 +14,20 @@ namespace OpenRA.FileFormats
 	{
 		public static int DecodeInto( byte[] src, byte[] dest )
 		{
-            var ctx = new FastByteReader(src);
+			var ctx = new FastByteReader(src);
 			int destIndex = 0;
 
 			while( true )
 			{
-                byte i = ctx.ReadByte();
+				byte i = ctx.ReadByte();
 				if( ( i & 0x80 ) == 0 )
 				{
 					int count = i & 0x7F;
 					if( count == 0 )
 					{
 						// case 6
-                        count = ctx.ReadByte();
-                        byte value = ctx.ReadByte();
+						count = ctx.ReadByte();
+						byte value = ctx.ReadByte();
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
 							dest[ destIndex ] ^= value;
 					}
@@ -35,7 +35,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 5
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-                            dest[destIndex] ^= ctx.ReadByte();
+							dest[destIndex] ^= ctx.ReadByte();
 					}
 				}
 				else
@@ -43,7 +43,7 @@ namespace OpenRA.FileFormats
 					int count = i & 0x7F;
 					if( count == 0 )
 					{
-                        count = ctx.ReadWord();
+						count = ctx.ReadWord();
 						if( count == 0 )
 							return destIndex;
 
@@ -56,12 +56,12 @@ namespace OpenRA.FileFormats
 						{
 							// case 3
 							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-                                dest[destIndex] ^= ctx.ReadByte();
+								dest[destIndex] ^= ctx.ReadByte();
 						}
 						else
 						{
 							// case 4
-                            byte value = ctx.ReadByte();
+							byte value = ctx.ReadByte();
 							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
 								dest[ destIndex ] ^= value;
 						}

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -13,32 +13,32 @@ using System.IO;
 
 namespace OpenRA.FileFormats
 {
-    class FastByteReader
-    {
-        readonly byte[] src;
-        int offset = 0;
+	class FastByteReader
+	{
+		readonly byte[] src;
+		int offset = 0;
 
-        public FastByteReader(byte[] src)
-        {
-            this.src = src;
-        }
+		public FastByteReader(byte[] src)
+		{
+			this.src = src;
+		}
 
-        public bool Done() { return offset >= src.Length; }
-        public byte ReadByte() { return src[offset++]; }
-        public int ReadWord()
-        {
-            int x = ReadByte();
-            return x | (ReadByte() << 8);
-        }
+		public bool Done() { return offset >= src.Length; }
+		public byte ReadByte() { return src[offset++]; }
+		public int ReadWord()
+		{
+			int x = ReadByte();
+			return x | (ReadByte() << 8);
+		}
 
-        public void CopyTo(byte[] dest, int offset, int count)
-        {
-            Array.Copy(src, this.offset, dest, offset, count);
-            this.offset += count;
-        }
+		public void CopyTo(byte[] dest, int offset, int count)
+		{
+			Array.Copy(src, this.offset, dest, offset, count);
+			this.offset += count;
+		}
 
 		public int Remaining() { return src.Length - offset; }
-    }
+	}
 
 	public static class Format80
 	{
@@ -61,16 +61,16 @@ namespace OpenRA.FileFormats
 
 		public static int DecodeInto( byte[] src, byte[] dest )
 		{
-            var ctx = new FastByteReader(src);
+			var ctx = new FastByteReader(src);
 			int destIndex = 0;
 
 			while( true )
 			{
-                byte i = ctx.ReadByte();
+				byte i = ctx.ReadByte();
 				if( ( i & 0x80 ) == 0 )
 				{
 					// case 2
-                    byte secondByte = ctx.ReadByte();
+					byte secondByte = ctx.ReadByte();
 					int count = ( ( i & 0x70 ) >> 4 ) + 3;
 					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
 
@@ -93,8 +93,8 @@ namespace OpenRA.FileFormats
 					if( count3 == 0x3E )
 					{
 						// case 4
-                        int count = ctx.ReadWord();
-                        byte color = ctx.ReadByte();
+						int count = ctx.ReadWord();
+						byte color = ctx.ReadByte();
 
 						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
 							dest[ destIndex ] = color;
@@ -102,8 +102,8 @@ namespace OpenRA.FileFormats
 					else if( count3 == 0x3F )
 					{
 						// case 5
-                        int count = ctx.ReadWord();
-                        int srcIndex = ctx.ReadWord();
+						int count = ctx.ReadWord();
+						int srcIndex = ctx.ReadWord();
 						if( srcIndex >= destIndex )
 							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
 
@@ -114,7 +114,7 @@ namespace OpenRA.FileFormats
 					{
 						// case 3
 						int count = count3 + 3;
-                        int srcIndex = ctx.ReadWord();
+						int srcIndex = ctx.ReadWord();
 						if( srcIndex >= destIndex )
 							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
 

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -38,36 +38,36 @@ namespace OpenRA.FileFormats
 
 		static IFolder OpenPackage(string filename)
 		{
-            return OpenPackage(filename, order++);
+			return OpenPackage(filename, order++);
 		}
 
 		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
-        {
+		{
 			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-                return new MixFile(filename, order, content);
-            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order, content);
-            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order, content);
-            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-                throw new NotImplementedException("Creating .Z archives is unsupported");
-            else
-                return new Folder(filename, order, content);
-        }
+				return new MixFile(filename, order, content);
+			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order, content);
+			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order, content);
+			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("Creating .Z archives is unsupported");
+			else
+				return new Folder(filename, order, content);
+		}
 
-        public static IFolder OpenPackage(string filename, int order)
-        {
-            if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-                return new MixFile(filename, order);
-            else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order);
-            else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-                return new ZipFile(filename, order);
-            else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-                return new InstallShieldPackage(filename, order);
-            else
-                return new Folder(filename, order);
-        }
+		public static IFolder OpenPackage(string filename, int order)
+		{
+			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+				return new MixFile(filename, order);
+			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order);
+			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(filename, order);
+			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+				return new InstallShieldPackage(filename, order);
+			else
+				return new Folder(filename, order);
+		}
 
 		public static void Mount(string name)
 		{
@@ -169,7 +169,7 @@ namespace OpenRA.FileFormats
 		{
 			foreach (var folder in mountedFolders)
 				if (folder.Exists(filename))
-				    return true;
+					return true;
 			return false;
 		}
 

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -70,7 +70,7 @@ namespace OpenRA.FileFormats
 			foreach (var file in contents)
 				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
 					using (var writer = new BinaryWriter(dataStream))
-				       writer.Write(file.Value);
+					   writer.Write(file.Value);
 		}
 	}
 }

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -73,13 +73,13 @@ namespace OpenRA.FileFormats.Graphics
 		void SetData(byte[] colors, int width, int height);
 	}
 
-    public enum PrimitiveType
-    {
-        PointList,
-        LineList,
-        TriangleList,
+	public enum PrimitiveType
+	{
+		PointList,
+		LineList,
+		TriangleList,
 		QuadList,
-    }
+	}
 
 	public struct Range<T>
 	{

OpenRA.FileFormats/HttpUtil.cs

@@ -1,97 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public static class HttpUtil
-	{
-		public static byte[] DownloadData(string url, Action<int, int> f, int chunkSize)
-		{
-			var uri = new Uri(url);
-			var ip = Dns.GetHostEntry(uri.DnsSafeHost).AddressList[0];
-
-			using (var s = new TcpClient())
-			{
-				s.Connect(new IPEndPoint(ip, uri.Port));
-				var ns = s.GetStream();
-				var sw = new StreamWriter(ns);
-
-				sw.Write("GET {0} HTTP/1.0\r\nHost:{1}\r\n\r\n", uri.PathAndQuery, uri.Host);
-				sw.Flush();
-
-				var br = new BinaryReader(ns);
-				var contentLength = 0;
-				var offset = 0;
-				for (; ; )
-				{
-					var result = br.ReadLine();
-					var kv = result.Split(new string[] { ": " }, StringSplitOptions.RemoveEmptyEntries);
-
-					if (result == "")
-					{
-						/* data follows the blank line */
-
-						if (contentLength > 0)
-						{
-							if (f != null)
-								f(offset, contentLength);
-
-							var data = new byte[contentLength];
-							while (offset < contentLength)
-							{
-								var thisChunk = Math.Min(contentLength - offset, chunkSize);
-								br.Read(data, offset, thisChunk);
-								offset += thisChunk;
-								if (f != null)
-									f(offset, contentLength);
-							}
-							s.Close();
-							return data;
-						}
-						else
-						{
-							s.Close();
-							return new byte[] { };
-						}
-					}
-					else if (kv[0] == "Content-Length")
-						contentLength = int.Parse(kv[1]);
-				}
-			}
-		}
-
-		public static byte[] DownloadData(string url, Action<int, int> f)
-		{
-			return DownloadData(url, f, 4096);
-		}
-
-		public static byte[] DownloadData(string url)
-		{
-			return DownloadData(url, null);
-		}
-
-		static string ReadLine(this BinaryReader br)
-		{
-			var sb = new StringBuilder();
-			char c;
-			while ((c = br.ReadChar()) != '\n')
-				if (c != '\r' && c != '\n')
-					sb.Append(c);
-
-			return sb.ToString();
-		}
-	}
-}

OpenRA.FileFormats/Manifest.cs

@@ -51,7 +51,7 @@ namespace OpenRA.FileFormats
 
 			LoadScreen = yaml["LoadScreen"];
 			Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key, x => Pair.New(x.Value.NodesDict["Font"].Value,
-				                                                  int.Parse(x.Value.NodesDict["Size"].Value)));
+												                  int.Parse(x.Value.NodesDict["Size"].Value)));
 			if (yaml.ContainsKey("TileSize"))
 				TileSize = int.Parse(yaml["TileSize"].Value);
 		}

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -28,7 +28,7 @@ namespace OpenRA.FileFormats
 		public string Race;
 
 		public bool LockColor = false;
-        public ColorRamp ColorRamp = new ColorRamp(0,0,238,34);
+		public ColorRamp ColorRamp = new ColorRamp(0,0,238,34);
 
 		public bool LockSpawn = false;
 		public int Spawn = 0;
@@ -41,9 +41,8 @@ namespace OpenRA.FileFormats
 		public string[] Enemies = {};
 
 		public PlayerReference() {}
-		public PlayerReference(MiniYaml my)
-		{
-			FieldLoader.Load(this, my);
-		}
+		public PlayerReference(MiniYaml my) { FieldLoader.Load(this, my); }
+
+		public override string ToString() { return Name; }
 	}
 }

OpenRA.FileFormats/MiniYaml.cs

@@ -22,7 +22,7 @@ namespace OpenRA.FileFormats
 		public struct SourceLocation
 		{
 			public string Filename; public int Line;
-            public override string ToString() { return "{0}:{1}".F(Filename, Line); }
+			public override string ToString() { return "{0}:{1}".F(Filename, Line); }
 		}
 
 		public SourceLocation Location;
@@ -55,10 +55,10 @@ namespace OpenRA.FileFormats
 		{
 		}
 
-        public override string ToString()
-        {
-            return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
-        }
+		public override string ToString()
+		{
+			return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
+		}
 	}
 
 	public class MiniYaml
@@ -177,15 +177,15 @@ namespace OpenRA.FileFormats
 			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
 		}
 
-        public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
-        {
-            return Merge(a, b, false);
-        }
+		public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
+		{
+			return Merge(a, b, false);
+		}
 
-        public static List<MiniYamlNode> MergeStrict(List<MiniYamlNode> a, List<MiniYamlNode> b)
-        {
-            return Merge(a, b, true);
-        }
+		public static List<MiniYamlNode> MergeStrict(List<MiniYamlNode> a, List<MiniYamlNode> b)
+		{
+			return Merge(a, b, true);
+		}
 
 		static List<MiniYamlNode> Merge( List<MiniYamlNode> a, List<MiniYamlNode> b, bool throwErrors )
 		{
@@ -200,8 +200,8 @@ namespace OpenRA.FileFormats
 			var bDict = b.ToDictionary( x => x.Key );
 			var keys = aDict.Keys.Union( bDict.Keys ).ToList();
 
-            var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
-                .ToDictionary(x => x.Substring(1), x => false);
+			var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
+				.ToDictionary(x => x.Substring(1), x => false);
 
 			foreach( var key in keys )
 			{
@@ -211,11 +211,11 @@ namespace OpenRA.FileFormats
 
 				if( noInherit.ContainsKey( key ) )
 				{
-                    if (!throwErrors)
-                        if (aa != null)
-                            ret.Add(aa);
+					if (!throwErrors)
+						if (aa != null)
+							ret.Add(aa);
 
-                    noInherit[key] = true;
+					noInherit[key] = true;
 				}
 				else
 				{
@@ -225,23 +225,23 @@ namespace OpenRA.FileFormats
 				}
 			}
 
-            if (throwErrors)
-            if (noInherit.ContainsValue(false))
-                throw new YamlException("Bogus yaml removals: {0}".F(
-                    string.Join(", ", noInherit.Where(x => !x.Value).Select(x => x.Key).ToArray())));
+			if (throwErrors)
+			if (noInherit.ContainsValue(false))
+				throw new YamlException("Bogus yaml removals: {0}".F(
+					noInherit.Where(x => !x.Value).JoinWith(", ")));
 
 			return ret;
 		}
 
-        public static MiniYaml MergeLiberal(MiniYaml a, MiniYaml b)
-        {
-            return Merge(a, b, false);
-        }
+		public static MiniYaml MergeLiberal(MiniYaml a, MiniYaml b)
+		{
+			return Merge(a, b, false);
+		}
 
-        public static MiniYaml MergeStrict(MiniYaml a, MiniYaml b)
-        {
-            return Merge(a, b, true);
-        }
+		public static MiniYaml MergeStrict(MiniYaml a, MiniYaml b)
+		{
+			return Merge(a, b, true);
+		}
 
 		static MiniYaml Merge( MiniYaml a, MiniYaml b, bool throwErrors )
 		{
@@ -271,7 +271,7 @@ namespace OpenRA.FileFormats
 
 		public static string WriteToString(this MiniYamlNodes y)
 		{
-			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+			return y.ToLines(true).Select(x => x.TrimEnd()).JoinWith("\n");
 		}
 
 		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
@@ -286,8 +286,8 @@ namespace OpenRA.FileFormats
 		}
 	}
 
-    public class YamlException : Exception
-    {
-        public YamlException(string s) : base(s) { }
-    }
+	public class YamlException : Exception
+	{
+		public YamlException(string s) : base(s) { }
+	}
 }

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -85,7 +85,6 @@
     <Compile Include="Graphics\ShpWriter.cs" />
     <Compile Include="Graphics\Vertex.cs" />
     <Compile Include="Graphics\VqaReader.cs" />
-    <Compile Include="HttpUtil.cs" />
     <Compile Include="InstallUtils.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="Map\PlayerReference.cs" />

OpenRA.FileFormats/Platform.cs

@@ -21,7 +21,7 @@ namespace OpenRA
 	{
 		public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
 
-		static Lazy<PlatformType> currentPlatform = new Lazy<PlatformType>(GetCurrentPlatform);
+		static Lazy<PlatformType> currentPlatform = Lazy.New((Func<PlatformType>)GetCurrentPlatform);
 
 		static PlatformType GetCurrentPlatform()
 		{

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -21,10 +21,10 @@ namespace OpenRA.FileFormats
 	{
 		Dictionary<int, Color> remapColors;
 
-		public PlayerColorRemap(ColorRamp c, PaletteFormat fmt)
+		public PlayerColorRemap(PaletteFormat fmt, ColorRamp c)
 		{
-            var c1 = c.GetColor(0);
-            var c2 = c.GetColor(1); /* temptemp: this can be expressed better */
+			var c1 = c.GetColor(0);
+			var c2 = c.GetColor(1); /* temptemp: this can be expressed better */
 
 			var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80;
 			var ramp = (fmt == PaletteFormat.cnc)

OpenRA.FileFormats/Primitives/Bits.cs

@@ -57,7 +57,7 @@ namespace OpenRA.FileFormats
 
 		public override string ToString()
 		{
-			return string.Join(",", BitAllocator<T>.GetStrings(Value).ToArray());
+			return BitAllocator<T>.GetStrings(Value).JoinWith(",");
 		}
 
 		public override int GetHashCode() { return Value.GetHashCode(); }

OpenRA.FileFormats/Primitives/Pair.cs

@@ -71,8 +71,8 @@ namespace OpenRA.FileFormats
 		public static IEqualityComparer<Pair<T, U>> EqualityComparer { get { return new PairEqualityComparer(); } }
 	}
 
-    public static class Pair
-    {
+	public static class Pair
+	{
 		public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
 
 		static Pair()
@@ -86,5 +86,5 @@ namespace OpenRA.FileFormats
 			public bool Equals(Color x, Color y) { return x.ToArgb() == y.ToArgb(); }
 			public int GetHashCode(Color obj) { return obj.GetHashCode(); }
 		}
-    }
+	}
 }

OpenRA.FileFormats/Primitives/float2.cs

@@ -62,23 +62,23 @@ namespace OpenRA
 				Constrain(Y, min.Y, max.Y));
 		}
 
-        public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
-        public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
 		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
 		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
 
-        public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
-        public static bool operator !=(float2 me, float2 other) { return !(me == other); }
-        public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+		public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(float2 me, float2 other) { return !(me == other); }
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
 
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-                return false;
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
 
-            float2 o = (float2)obj;
-            return o == this;
-        }
+			float2 o = (float2)obj;
+			return o == this;
+		}
 
 		public static readonly float2 Zero = new float2(0, 0);
 

OpenRA.FileFormats/Primitives/int2.cs

@@ -52,7 +52,7 @@ namespace OpenRA
 
 		public static readonly int2 Zero = new int2(0, 0);
 		public Point ToPoint() { return new Point(X, Y); }
-        public PointF ToPointF() { return new PointF(X, Y); }
+		public PointF ToPointF() { return new PointF(X, Y); }
 		public float2 ToFloat2() { return new float2(X, Y); }
 
 		public override string ToString() { return string.Format("{0},{1}", X, Y); }
@@ -76,7 +76,7 @@ namespace OpenRA
 		public int2 Clamp(Rectangle r)
 		{
 			return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
-			                Math.Min(r.Bottom, Math.Max(Y, r.Top)));
+							Math.Min(r.Bottom, Math.Max(Y, r.Top)));
 		}
 
 		public static int Dot(int2 a, int2 b) { return a.X * b.X + a.Y * b.Y; }

OpenRA.FileFormats/Support/Log.cs

@@ -38,34 +38,34 @@ namespace OpenRA
 			}
 		}
 
-        static IEnumerable<string> FilenamesForChannel(string channelName, string baseFilename)
-        {
-            for(var i = 0;; i++ )
-                yield return Path.Combine(LogPathPrefix,
-                    i > 0 ? "{0}.{1}".F(baseFilename, i) : baseFilename);
-        }
+		static IEnumerable<string> FilenamesForChannel(string channelName, string baseFilename)
+		{
+			for(var i = 0;; i++ )
+				yield return Path.Combine(LogPathPrefix,
+					i > 0 ? "{0}.{1}".F(baseFilename, i) : baseFilename);
+		}
 
-        public static void AddChannel(string channelName, string baseFilename)
-        {
-            if (channels.ContainsKey(channelName)) return;
+		public static void AddChannel(string channelName, string baseFilename)
+		{
+			if (channels.ContainsKey(channelName)) return;
 
-            foreach (var filename in FilenamesForChannel(channelName, baseFilename))
-                try
-                {
-                    var writer = File.CreateText(filename);
-                    writer.AutoFlush = true;
+			foreach (var filename in FilenamesForChannel(channelName, baseFilename))
+				try
+				{
+					var writer = File.CreateText(filename);
+					writer.AutoFlush = true;
 
-                    channels.Add(channelName,
-                        new ChannelInfo()
-                        {
-                            Filename = filename,
-                            Writer = writer
-                        });
+					channels.Add(channelName,
+						new ChannelInfo()
+						{
+							Filename = filename,
+							Writer = writer
+						});
 
-                    return;
-                }
-                catch (IOException) { }
-        }
+					return;
+				}
+				catch (IOException) { }
+		}
 
 		public static void Write(string channel, string format, params object[] args)
 		{

OpenRA.FileFormats/TypeDictionary.cs

@@ -64,13 +64,18 @@ namespace OpenRA.FileFormats
 
 		public T GetOrDefault<T>()
 		{
-			if( dataMultiple.ContainsKey( typeof( T ) ) )
-				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", typeof( T ) ) );
+			return (T)GetOrDefault(typeof(T));
+		}
+
+		public object GetOrDefault(Type t)
+		{
+			if( dataMultiple.ContainsKey(t) )
+				throw new InvalidOperationException( string.Format( "TypeDictionary contains multiple instance of type `{0}`", t ) );
 
 			object ret;
-			if( !dataSingular.TryGetValue( typeof( T ), out ret ) )
-				return default( T );
-			return (T)ret;
+			if( !dataSingular.TryGetValue(t, out ret ) )
+				return null;
+			return ret;
 		}
 
 		public IEnumerable<T> WithInterface<T>()

OpenRA.Game/Actor.cs

@@ -82,7 +82,7 @@ namespace OpenRA
 				// auto size from render
 				var firstSprite = TraitsImplementing<IRender>().SelectMany(ApplyIRender).FirstOrDefault();
 				if (firstSprite.Sprite == null) return int2.Zero;
-                return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
+				return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
 			});
 
 			ApplyIRender = x => x.Render(this);
@@ -105,7 +105,7 @@ namespace OpenRA
 			get { return currentActivity == null; }
 		}
 
-        OpenRA.FileFormats.Lazy<int2> Size;
+		OpenRA.FileFormats.Lazy<int2> Size;
 
 		// note: these delegates are cached to avoid massive allocation.
 		Func<IRender, IEnumerable<Renderable>> ApplyIRender;

OpenRA.Game/ActorReference.cs

@@ -15,8 +15,8 @@ namespace OpenRA.FileFormats
 {
 	public class ActorReference : IEnumerable
 	{
-		public readonly string Type;
-		public readonly TypeDictionary InitDict;
+		public string Type;
+		public TypeDictionary InitDict;
 
 		public ActorReference( string type ) : this( type, new Dictionary<string, MiniYaml>() ) { }
 

OpenRA.Game/Game.cs

@@ -205,13 +205,13 @@ namespace OpenRA
 		}
 
 		public static event Action BeforeGameStart = () => {};
-		internal static void StartGame(string mapUID)
+		internal static void StartGame(string mapUID, bool isShellmap)
 		{
 			BeforeGameStart();
 
 			var map = modData.PrepareMap(mapUID);
 			viewport = new Viewport(new int2(Renderer.Resolution), map.Bounds, Renderer);
-			orderManager.world = new World(modData.Manifest, map, orderManager);
+			orderManager.world = new World(modData.Manifest, map, orderManager) { IsShellmap = isShellmap };
 			worldRenderer = new WorldRenderer(orderManager.world);
 
 			if (orderManager.GameStarted) return;
@@ -280,7 +280,7 @@ namespace OpenRA
 
 			// Discard any invalid mods
 			var mm = mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
-			Console.WriteLine("Loading mods: {0}",string.Join(",",mm));
+			Console.WriteLine("Loading mods: {0}", mm.JoinWith(","));
 			Settings.Game.Mods = mm;
 			Settings.Save();
 
@@ -306,27 +306,40 @@ namespace OpenRA
 
 		public static void LoadShellMap()
 		{
-			StartGame(ChooseShellmap());
+			StartGame(ChooseShellmap(), true);
 		}
 
-        static string ChooseShellmap()
-        {
-            var shellmaps =  modData.AvailableMaps
-                .Where(m => m.Value.UseAsShellmap);
+		static string ChooseShellmap()
+		{
+			var shellmaps =  modData.AvailableMaps
+				.Where(m => m.Value.UseAsShellmap);
 
 			if (shellmaps.Count() == 0)
 				throw new InvalidDataException("No valid shellmaps available");
 
 			return shellmaps.Random(CosmeticRandom).Key;
-        }
+		}
 
 		static bool quit;
 		public static event Action OnQuit = () => {};
+
 		internal static void Run()
 		{
 			while (!quit)
+			{
+				var idealFrameTime = 1.0 / Settings.Graphics.MaxFramerate;
+				var sw = new Stopwatch();
+
 				Tick( orderManager, viewport );
 
+				if (Settings.Graphics.CapFramerate)
+				{
+					var waitTime = idealFrameTime - sw.ElapsedTime();
+					if (waitTime > 0)
+						System.Threading.Thread.Sleep( TimeSpan.FromSeconds(waitTime) );
+				}
+			}
+
 			OnQuit();
 		}
 
@@ -343,9 +356,10 @@ namespace OpenRA
 		{
 			if (orderManager.world != null)
 				orderManager.world.traitDict.PrintReport();
+
+			orderManager.Dispose();
 			CloseServer();
 			JoinLocal();
-			orderManager.Dispose();
 		}
 
 		public static void CloseServer()
@@ -387,5 +401,22 @@ namespace OpenRA
 		{
 			return orderManager != null && orderManager.world == world;
 		}
+
+		public static void JoinExternalGame()
+		{
+			var addressParts = Game.Settings.Game.ConnectTo.Split(
+				new [] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+
+			if (addressParts.Length < 1 || addressParts.Length > 2)
+				return;
+
+			var host = addressParts[0];
+			var port = Exts.WithDefault(1234, () => int.Parse(addressParts[1]));
+
+			Game.Settings.Game.ConnectTo = "";
+			Game.Settings.Save();
+
+			Game.JoinServer(host, port);
+		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

@@ -23,30 +23,21 @@ namespace OpenRA
 
 		public ActorInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
-            try
-            {
-                var mergedNode = MergeWithParent(node, allUnits).NodesDict;
+			try
+			{
+				var mergedNode = MergeWithParent(node, allUnits).NodesDict;
 
-                Name = name;
-                foreach (var t in mergedNode)
-                    if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
-                        Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
-            }
-            catch (YamlException e)
-            {
-                throw new YamlException("Actor type {0}: {1}".F(name, e.Message));
-            }
+				Name = name;
+				foreach (var t in mergedNode)
+					if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
+						Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+			}
+			catch (YamlException e)
+			{
+				throw new YamlException("Actor type {0}: {1}".F(name, e.Message));
+			}
 		}
 
-        static IEnumerable<MiniYaml> GetInheritanceChain(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
-        {
-            while (node != null)
-            {
-                yield return node;
-                node = GetParent(node, allUnits);
-            }
-        }
-
 		static MiniYaml GetParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
 			MiniYaml inherits;
@@ -56,9 +47,9 @@ namespace OpenRA
 
 			MiniYaml parent;
 			allUnits.TryGetValue( inherits.Value, out parent );
-            if (parent == null)
-                throw new InvalidOperationException(
-                    "Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
+			if (parent == null)
+				throw new InvalidOperationException(
+					"Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
 
 			return parent;
 		}
@@ -66,14 +57,14 @@ namespace OpenRA
 		static MiniYaml MergeWithParent( MiniYaml node, Dictionary<string, MiniYaml> allUnits )
 		{
 			var parent = GetParent( node, allUnits );
-            if (parent != null)
-            {
-                var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
+			if (parent != null)
+			{
+				var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
 
-                // strip the '-'
-                result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
-                return result;
-            }
+				// strip the '-'
+				result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
+				return result;
+			}
 			return node;
 		}
 
@@ -102,14 +93,14 @@ namespace OpenRA
 				else if (++index >= t.Count)
 					throw new InvalidOperationException("Trait prerequisites not satisfied (or prerequisite loop) Actor={0} Unresolved={1} Missing={2}".F(
 						Name,
-						string.Join(",", t.Select(x => x.GetType().Name).ToArray()),
-						string.Join(",", unsatisfied.Select(x => x.Name).ToArray())));
+						t.Select(x => x.GetType().Name).JoinWith(","),
+						unsatisfied.Select(x => x.Name).JoinWith(",")));
 			}
 
 			return ret;
 		}
 
-		static List<Type> PrerequisitesOf( ITraitInfo info )
+		static List<Type> PrerequisitesOf(ITraitInfo info)
 		{
 			return info
 				.GetType()
@@ -118,5 +109,19 @@ namespace OpenRA
 				.Select( t => t.GetGenericArguments()[ 0 ] )
 				.ToList();
 		}
+
+		public IEnumerable<Pair<string, Type>> GetInitKeys()
+		{
+			var inits = Traits.WithInterface<ITraitInfo>().SelectMany(
+				t => t.GetType().GetInterfaces()
+					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
+					.Select(i => i.GetGenericArguments()[0])).ToList();
+
+			inits.Add( typeof(OwnerInit) );		/* not exposed by a trait; this is used by the Actor itself */
+
+			return inits.Select(
+				i => Pair.New(
+					i.Name.Replace( "Init", "" ), i ));
+		}
 	}
 }

OpenRA.Game/GameRules/Settings.cs

@@ -49,7 +49,7 @@ namespace OpenRA.GameRules
 		public bool PerfText = false;
 		public bool PerfGraph = false;
 		public float LongTickThreshold = 0.001f;
-        public bool SanityCheckUnsyncedCode = false;
+		public bool SanityCheckUnsyncedCode = false;
 		public int Samples = 25;
 	}
 
@@ -60,6 +60,8 @@ namespace OpenRA.GameRules
 		public int2 FullscreenSize = new int2(0,0);
 		public int2 WindowedSize = new int2(1024, 768);
 		public bool PixelDouble = false;
+		public bool CapFramerate = false;
+		public int MaxFramerate = 60;
 
 		public int BatchSize = 8192;
 		public int NumTempBuffers = 8;
@@ -79,7 +81,7 @@ namespace OpenRA.GameRules
 	public class PlayerSettings
 	{
 		public string Name = "Newbie";
-        public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
+		public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
 		public string LastServer = "localhost:1234";
 	}
 
@@ -90,13 +92,16 @@ namespace OpenRA.GameRules
 		public string[] Mods = { "ra" };
 
 		public bool TeamChatToggle = false;
+		public bool ShowShellmap = true;
 
-        public bool ViewportEdgeScroll = true;
-        public MouseScrollType MouseScroll = MouseScrollType.Standard;
+		public bool ViewportEdgeScroll = true;
+		public MouseScrollType MouseScroll = MouseScrollType.Standard;
 		public float ViewportEdgeScrollStep = 10f;
 
 		// Internal game settings
 		public int Timestep = 40;
+
+		public string ConnectTo = "";
 	}
 
 	public class Settings
@@ -109,7 +114,9 @@ namespace OpenRA.GameRules
 		public GraphicSettings Graphics = new GraphicSettings();
 		public ServerSettings Server = new ServerSettings();
 		public DebugSettings Debug = new DebugSettings();
+
 		public Dictionary<string, object> Sections;
+
 		public Settings(string file, Arguments args)
 		{
 			SettingsFile = file;
@@ -123,7 +130,6 @@ namespace OpenRA.GameRules
 				{"Debug", Debug},
 			};
 
-
 			// Override fieldloader to ignore invalid entries
 			var err1 = FieldLoader.UnknownFieldAction;
 			var err2 = FieldLoader.InvalidValueAction;
@@ -135,7 +141,6 @@ namespace OpenRA.GameRules
 
 			if (File.Exists(SettingsFile))
 			{
-				//Console.WriteLine("Loading settings file {0}",SettingsFile);
 				var yaml = MiniYaml.DictFromFile(SettingsFile);
 
 				foreach (var kv in Sections)
@@ -164,11 +169,11 @@ namespace OpenRA.GameRules
 
 		void LoadSectionYaml(MiniYaml yaml, object section)
 		{
-			object defaults = Activator.CreateInstance(section.GetType());
+			var defaults = Activator.CreateInstance(section.GetType());
 			FieldLoader.InvalidValueAction = (s,t,f) =>
 			{
-				object ret = defaults.GetType().GetField(f).GetValue(defaults);
-				System.Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) );
+				var ret = defaults.GetType().GetField(f).GetValue(defaults);
+				Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) );
 				return ret;
 			};
 

OpenRA.Game/Graphics/Sequence.cs

@@ -8,9 +8,10 @@
  */
 #endregion
 
+using System;
 using System.Xml;
-using OpenRA.FileFormats;
 using System.Collections.Generic;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Graphics
 {
@@ -33,7 +34,7 @@ namespace OpenRA.Graphics
 			Name = name;
 			var d = info.NodesDict;
 
-			sprites = Game.modData.SpriteLoader.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
+			sprites = Game.modData.SpriteLoader.LoadAllSprites(srcOverride ?? unit);
 			start = int.Parse(d["Start"].Value);
 
 			if (!d.ContainsKey("Length"))
@@ -53,6 +54,12 @@ namespace OpenRA.Graphics
 				tick = int.Parse(d["Tick"].Value);
 			else
 				tick = 40;
+
+			if (start < 0 || start + facings * length > sprites.Length)
+				throw new InvalidOperationException(
+					"{6}: Sequence {0}.{1} uses frames [{2}..{3}] of SHP `{4}`, but only 0..{5} actually exist"
+					.F(unit, name, start, start + facings * length - 1, srcOverride ?? unit, sprites.Length - 1,
+					info.Nodes[0].Location));
 		}
 
 		public MiniYaml Save()

OpenRA.Game/Graphics/Sprite.cs

@@ -60,10 +60,10 @@ namespace OpenRA.Graphics
 			Game.Renderer.WorldSpriteRenderer.DrawSprite( this, location, paletteIndex, this.size );
 		}
 
-        public void DrawAt(float2 location, int paletteIndex, float scale)
-        {
-            Game.Renderer.WorldSpriteRenderer.DrawSprite(this, location, paletteIndex, this.size * scale);
-        }
+		public void DrawAt(float2 location, int paletteIndex, float scale)
+		{
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(this, location, paletteIndex, this.size * scale);
+		}
 
 		public void DrawAt( float2 location, int paletteIndex, float2 size )
 		{

OpenRA.Game/Graphics/SpriteFont.cs

@@ -70,18 +70,18 @@ namespace OpenRA.Graphics
 			}
 		}
 
-        public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
-        {
-            if (offset > 0)
-            {
-                DrawText(text, location + new float2(-offset, 0), bg);
-                DrawText(text, location + new float2(offset, 0), bg);
-                DrawText(text, location + new float2(0, -offset), bg);
-                DrawText(text, location + new float2(0, offset), bg);
-            }
+		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
+		{
+			if (offset > 0)
+			{
+				DrawText(text, location + new float2(-offset, 0), bg);
+				DrawText(text, location + new float2(offset, 0), bg);
+				DrawText(text, location + new float2(0, -offset), bg);
+				DrawText(text, location + new float2(0, offset), bg);
+			}
 
-            DrawText(text, location, fg);
-        }
+			DrawText(text, location, fg);
+		}
 
 		public int2 Measure(string text)
 		{

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Graphics
 			sprites = new Cache<string, Sprite[]>( LoadSprites );
 		}
 
-        readonly SheetBuilder SheetBuilder;
+		readonly SheetBuilder SheetBuilder;
 		readonly Cache<string, Sprite[]> sprites;
 		readonly string[] exts;
 

OpenRA.Game/Graphics/Viewport.cs

@@ -18,14 +18,7 @@ using OpenRA.Support;
 namespace OpenRA.Graphics
 {
 	[Flags]
-	public enum ScrollDirection
-	{
-		None = 0,
-		Up = 1,
-		Left = 2,
-		Down = 4,
-		Right = 8
-	}
+	public enum ScrollDirection { None = 0, Up = 1, Left = 2, Down = 4, Right = 8 }
 
 	public class Viewport
 	{
@@ -44,9 +37,9 @@ namespace OpenRA.Graphics
 			get
 			{
 				return new Rectangle(scrollPosition.X / Game.CellSize,
-				                     scrollPosition.Y / Game.CellSize,
-				                     (int)(screenSize.X / Zoom / Game.CellSize),
-				                     (int)(screenSize.Y / Zoom / Game.CellSize));
+									 scrollPosition.Y / Game.CellSize,
+									 (int)(screenSize.X / Zoom / Game.CellSize),
+									 (int)(screenSize.Y / Zoom / Game.CellSize));
 			}
 		}
 
@@ -70,9 +63,9 @@ namespace OpenRA.Graphics
 				var viewBR = (Game.CellSize*new float2(mapBounds.Right, mapBounds.Bottom)).ToInt2();
 				var border = (.5f/Zoom * screenSize.ToFloat2()).ToInt2();
 				scrollLimits = Rectangle.FromLTRB(viewTL.X - border.X,
-			                                  viewTL.Y - border.Y,
-			                                  viewBR.X - border.X,
-			                                  viewBR.Y - border.Y);
+											  viewTL.Y - border.Y,
+											  viewBR.X - border.X,
+											  viewBR.Y - border.Y);
 				// Re-center viewport
 				scrollPosition = NormalizeScrollPosition((oldCenter - 0.5f / Zoom * screenSize.ToFloat2()).ToInt2());
 			}
@@ -135,13 +128,13 @@ namespace OpenRA.Graphics
 			{
 				Widget.DoDraw();
 				var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-	            var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
+				var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
 				var cursorSprite = cursorSequence.GetSprite((int)cursorFrame);
 
 				renderer.SpriteRenderer.DrawSprite(cursorSprite,
-				                                   Viewport.LastMousePos - cursorSequence.Hotspot,
-				                                   Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette),
-				                                   cursorSprite.size);
+												   Viewport.LastMousePos - cursorSequence.Hotspot,
+												   Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette),
+												   cursorSprite.size);
 			}
 
 			using( new PerfSample("render_flip") )

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -67,6 +67,10 @@ namespace OpenRA.Graphics
 		public void Draw()
 		{
 			RefreshPalette();
+
+			if (world.IsShellmap && !Game.Settings.Game.ShowShellmap)
+				return;
+
 			var bounds = Game.viewport.ViewBounds(world);
 			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
@@ -85,8 +89,8 @@ namespace OpenRA.Graphics
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderBeforeWorld(this, world);
 
-            foreach (var image in SpritesToRender() )
-                image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
+			foreach (var image in SpritesToRender())
+				image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
 
 			// added for contrails
 			foreach (var a in world.ActorsWithTrait<IPostRender>())
@@ -99,10 +103,11 @@ namespace OpenRA.Graphics
 			shroudRenderer.Draw( this );
 			Game.Renderer.DisableScissor();
 
-			foreach (var a in world.Selection.Actors)
-				if (!a.Destroyed)
-					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-						t.RenderAfterWorld(this, a);
+			foreach (var g in world.Selection.Actors.Where(a => !a.Destroyed)
+				.SelectMany(a => a.TraitsImplementing<IPostRenderSelection>())
+				.GroupBy(prs => prs.GetType()))
+				foreach (var t in g)
+					t.RenderAfterWorld(this);
 
 			Game.Renderer.Flush();
 		}

OpenRA.Game/Group.cs

@@ -36,7 +36,7 @@ namespace OpenRA
 		{
 			/* debug crap */
 			Game.Debug("Group #{0}: {1}".F(
-				id, string.Join(",", actors.Select(a => "#{0} {1}".F(a.ActorID, a.Info.Name)).ToArray())));
+				id, actors.Select(a => "#{0} {1}".F(a.ActorID, a.Info.Name)).JoinWith(",")));
 		}
 
 		/* todo: add lazy group path crap, groupleader, pruning, etc */

OpenRA.Game/Map.cs

@@ -22,14 +22,14 @@ namespace OpenRA
 {
 	public class Map
 	{
-		[FieldLoader.Ignore] protected IFolder Container;
-		public string Path {get; protected set;}
+		[FieldLoader.Ignore] IFolder Container;
+		public string Path { get; private set; }
 
 		// Yaml map data
-		public string Uid { get; protected set; }
+		public string Uid { get; private set; }
 		public int MapFormat;
 		public bool Selectable;
-        public bool UseAsShellmap;
+		public bool UseAsShellmap;
 		public string RequiresMod;
 
 		public string Title;
@@ -41,7 +41,14 @@ namespace OpenRA
 		[FieldLoader.Ignore] public Lazy<Dictionary<string, ActorReference>> Actors;
 
 		public int PlayerCount { get { return Players.Count(p => p.Value.Playable); } }
-		public IEnumerable<int2> SpawnPoints { get { return Actors.Value.Values.Where(a => a.Type == "mpspawn").Select(a => a.InitDict.Get<LocationInit>().value); } }
+
+		public int2[] GetSpawnPoints()
+		{
+			return Actors.Value.Values
+				.Where(a => a.Type == "mpspawn")
+				.Select(a => a.InitDict.Get<LocationInit>().value)
+				.ToArray();
+		}
 
 		public Rectangle Bounds;
 
@@ -95,14 +102,6 @@ namespace OpenRA
 			return map;
 		}
 
-		class Format2ActorReference
-		{
-			public string Id = null;
-			public string Type = null;
-			public int2 Location = int2.Zero;
-			public string Owner = null;
-		}
-
 		void AssertExists(string filename)
 		{
 			using(var s = Container.GetContent(filename))
@@ -120,7 +119,7 @@ namespace OpenRA
 
 			var yaml = new MiniYaml( null, MiniYaml.FromStream(Container.GetContent("map.yaml")) );
 			FieldLoader.Load(this, yaml);
-            Uid = ComputeHash();
+			Uid = ComputeHash();
 
 			// 'Simple' metadata
 			FieldLoader.Load( this, yaml );
@@ -155,8 +154,8 @@ namespace OpenRA
 				var ret = new List<SmudgeReference>();
 				foreach (var kv in yaml.NodesDict["Smudges"].NodesDict)
 				{
-					string[] vals = kv.Key.Split(' ');
-					string[] loc = vals[1].Split(',');
+					var vals = kv.Key.Split(' ');
+					var loc = vals[1].Split(',');
 					ret.Add(new SmudgeReference(vals[0], new int2(int.Parse(loc[0]), int.Parse(loc[1])), int.Parse(vals[2])));
 				}
 
@@ -187,7 +186,7 @@ namespace OpenRA
 			MapFormat = 5;
 
 			var root = new List<MiniYamlNode>();
-			var fields = new string[]
+			var fields = new []
 			{
 				"Selectable",
 				"MapFormat",
@@ -225,7 +224,7 @@ namespace OpenRA
 			root.Add(new MiniYamlNode("Weapons", null, Weapons));
 			root.Add(new MiniYamlNode("Voices", null, Voices));
 
-			Dictionary<string, byte[]> entries = new Dictionary<string, byte[]>();
+			var entries = new Dictionary<string, byte[]>();
 			entries.Add("map.bin", SaveBinaryData());
 			var s = root.WriteToString();
 			entries.Add("map.yaml", Encoding.UTF8.GetBytes(s));
@@ -312,8 +311,8 @@ namespace OpenRA
 					ReadByte(dataStream);
 
 				// Load resource data
-				for (int i = 0; i < MapSize.X; i++)
-					for (int j = 0; j < MapSize.Y; j++)
+				for (var i = 0; i < MapSize.X; i++)
+					for (var j = 0; j < MapSize.Y; j++)
 				{
 					byte type = ReadByte(dataStream);
 					byte index = ReadByte(dataStream);
@@ -325,7 +324,7 @@ namespace OpenRA
 
 		public byte[] SaveBinaryData()
 		{
-			MemoryStream dataStream = new MemoryStream();
+			var dataStream = new MemoryStream();
 			using (var writer = new BinaryWriter(dataStream))
 			{
 				// File header consists of a version byte, followed by 2 ushorts for width and height
@@ -336,11 +335,11 @@ namespace OpenRA
 				if (!OpenRA.Rules.TileSets.ContainsKey(Tileset))
 					throw new InvalidOperationException(
 						"Tileset used by the map ({0}) does not exist in this mod. Valid tilesets are: {1}"
-						.F(Tileset, string.Join(",", OpenRA.Rules.TileSets.Keys.ToArray())));
+						.F(Tileset, OpenRA.Rules.TileSets.Keys.JoinWith(",")));
 
 				// Tile data
-				for (int i = 0; i < MapSize.X; i++)
-					for (int j = 0; j < MapSize.Y; j++)
+				for (var i = 0; i < MapSize.X; i++)
+					for (var j = 0; j < MapSize.Y; j++)
 					{
 						writer.Write(MapTiles.Value[i, j].type);
 						var PickAny = OpenRA.Rules.TileSets[Tileset].Templates[MapTiles.Value[i, j].type].PickAny;
@@ -348,8 +347,8 @@ namespace OpenRA
 					}
 
 				// Resource data
-				for (int i = 0; i < MapSize.X; i++)
-					for (int j = 0; j < MapSize.Y; j++)
+				for (var i = 0; i < MapSize.X; i++)
+					for (var j = 0; j < MapSize.Y; j++)
 					{
 						writer.Write(MapResources.Value[i, j].type);
 						writer.Write(MapResources.Value[i, j].index);
@@ -358,15 +357,8 @@ namespace OpenRA
 			return dataStream.ToArray();
 		}
 
-		public bool IsInMap(int2 xy)
-		{
-			return IsInMap(xy.X, xy.Y);
-		}
-
-		public bool IsInMap(int x, int y)
-		{
-			return Bounds.Contains(x,y);
-		}
+		public bool IsInMap(int2 xy) { return IsInMap(xy.X, xy.Y); }
+		public bool IsInMap(int x, int y) { return Bounds.Contains(x,y); }
 
 		static T[,] ResizeArray<T>(T[,] ts, T t, int width, int height)
 		{
@@ -394,23 +386,23 @@ namespace OpenRA
 		}
 
 		string ComputeHash()
-        {
-            // UID is calculated by taking an SHA1 of the yaml and binary data
-            // Read the relevant data into a buffer
-            var data = Container.GetContent("map.yaml").ReadAllBytes()
-                .Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray();
+		{
+			// UID is calculated by taking an SHA1 of the yaml and binary data
+			// Read the relevant data into a buffer
+			var data = Container.GetContent("map.yaml").ReadAllBytes()
+				.Concat(Container.GetContent("map.bin").ReadAllBytes()).ToArray();
 
-            // Take the SHA1
-            using (var csp = SHA1.Create())
-                return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
-        }
+			// Take the SHA1
+			using (var csp = SHA1.Create())
+				return new string(csp.ComputeHash(data).SelectMany(a => a.ToString("x2")).ToArray());
+		}
 
 		public void MakeDefaultPlayers()
 		{
 			Players.Clear();
 
 			var firstRace = OpenRA.Rules.Info["world"].Traits
-				.WithInterface<CountryInfo>().First().Race;
+				.WithInterface<CountryInfo>().First(c => c.Selectable).Race;
 
 			Players.Add("Neutral", new PlayerReference
 			{
@@ -420,7 +412,8 @@ namespace OpenRA
 				NonCombatant = true
 			});
 
-			for (int index = 0; index < SpawnPoints.Count(); index++)
+			var numSpawns = GetSpawnPoints().Length;
+			for (var index = 0; index < numSpawns; index++)
 			{
 				var p = new PlayerReference
 				{

OpenRA.Game/ModData.cs

@@ -82,21 +82,21 @@ namespace OpenRA
 			return map;
 		}
 
-        public static IEnumerable<string> FindMapsIn(string dir)
-        {
-            string[] NoMaps = { };
+		public static IEnumerable<string> FindMapsIn(string dir)
+		{
+			string[] NoMaps = { };
 
-            if (!Directory.Exists(dir))
-                return NoMaps;
+			if (!Directory.Exists(dir))
+				return NoMaps;
 
-            return Directory.GetDirectories(dir)
-                .Concat(Directory.GetFiles(dir, "*.zip"))
-                .Concat(Directory.GetFiles(dir, "*.oramap"));
-        }
+			return Directory.GetDirectories(dir)
+				.Concat(Directory.GetFiles(dir, "*.zip"))
+				.Concat(Directory.GetFiles(dir, "*.oramap"));
+		}
 
 		Dictionary<string, Map> FindMaps(string[] mods)
 		{
-            var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
+			var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
 				.Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Platform.SupportDir, p))));
 
 			var ret = new Dictionary<string, Map>();

OpenRA.Game/Network/Connection.cs

@@ -18,7 +18,7 @@ using OpenRA.Support;
 
 namespace OpenRA.Network
 {
-    public enum ConnectionState
+	public enum ConnectionState
 	{
 		PreConnecting,
 		NotConnected,
@@ -26,7 +26,7 @@ namespace OpenRA.Network
 		Connected,
 	}
 
-    public interface IConnection : IDisposable
+	public interface IConnection : IDisposable
 	{
 		int LocalClientId { get; }
 		ConnectionState ConnectionState { get; }
@@ -202,7 +202,10 @@ namespace OpenRA.Network
 			if (socket != null)
 				socket.Client.Close();
 			using( new PerfSample( "Thread.Join" ))
-				t.Join();
+			{
+				if (!t.Join(1000))
+					return;
+			}
 		}
 
 		~NetworkConnection() { Dispose(); }

OpenRA.Game/Network/FrameData.cs

@@ -44,17 +44,17 @@ namespace OpenRA.Network
 			frameData.Add( clientId, orders );
 		}
 
-        public bool IsReadyForFrame(int frame)
-        {
-            return !ClientsNotReadyForFrame(frame).Any();
-        }
+		public bool IsReadyForFrame(int frame)
+		{
+			return !ClientsNotReadyForFrame(frame).Any();
+		}
 
-        public IEnumerable<int> ClientsNotReadyForFrame(int frame)
-        {
-            var frameData = framePackets.GetOrAdd(frame);
-            return ClientsPlayingInFrame(frame)
-                .Where(client => !frameData.ContainsKey(client));
-        }
+		public IEnumerable<int> ClientsNotReadyForFrame(int frame)
+		{
+			var frameData = framePackets.GetOrAdd(frame);
+			return ClientsPlayingInFrame(frame)
+				.Where(client => !frameData.ContainsKey(client));
+		}
 
 		public IEnumerable<ClientOrder> OrdersForFrame( World world, int frame )
 		{

OpenRA.Game/Network/GameServer.cs

@@ -52,6 +52,15 @@ namespace OpenRA.Network
 			if (Game.CurrentMods.Count != Mods.Count())
 				return false;
 
+			// Don't have the map locally
+			if (!Game.modData.AvailableMaps.ContainsKey(Map))
+				return false;
+
+			return CompatibleVersion();
+		}
+
+		public bool CompatibleVersion()
+		{
 			return UsefulMods.All(m => Game.CurrentMods.ContainsKey(m.Key)
 				&& AreVersionsCompatible(m.Value, Game.CurrentMods[m.Key].Version));
 		}

OpenRA.Game/Network/Order.cs

@@ -67,7 +67,7 @@ namespace OpenRA
 
 		public Order(string orderstring, Order order)
 			: this(orderstring, order.Subject, order.TargetActor, order.TargetLocation,
-			       order.TargetString, order.Queued, order.ExtraLocation) {}
+				   order.TargetString, order.Queued, order.ExtraLocation) {}
 
 		public byte[] Serialize()
 		{
@@ -85,7 +85,7 @@ namespace OpenRA
 			{
 				// Format:
 				//		u8    : orderID.
-				//		            0xFF: Full serialized order.
+				//					0xFF: Full serialized order.
 				//		varies: rest of order.
 				default:
 					// TODO: specific serializers for specific orders.

OpenRA.Game/Network/OrderManager.cs

@@ -16,7 +16,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Network
 {
-    public class OrderManager : IDisposable
+	public class OrderManager : IDisposable
 	{
 		readonly SyncReport syncReport;
 		readonly FrameData frameData = new FrameData();
@@ -157,17 +157,17 @@ namespace OpenRA.Network
 			get { return NetFrameNumber >= 1 && frameData.IsReadyForFrame( NetFrameNumber ); }
 		}
 
-        static readonly IEnumerable<Session.Client> NoClients = new Session.Client[] {};
-        public IEnumerable<Session.Client> GetClientsNotReadyForNextFrame
-        {
-            get
-            {
-                return NetFrameNumber >= 1
-                    ? frameData.ClientsNotReadyForFrame(NetFrameNumber)
-                        .Select(a => LobbyInfo.ClientWithIndex(a))
-                    : NoClients;
-            }
-        }
+		static readonly IEnumerable<Session.Client> NoClients = new Session.Client[] {};
+		public IEnumerable<Session.Client> GetClientsNotReadyForNextFrame
+		{
+			get
+			{
+				return NetFrameNumber >= 1
+					? frameData.ClientsNotReadyForFrame(NetFrameNumber)
+						.Select(a => LobbyInfo.ClientWithIndex(a))
+					: NoClients;
+			}
+		}
 
 		public void Tick()
 		{

OpenRA.Game/Network/Replay.cs

@@ -0,0 +1,69 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using OpenRA.Network;
+
+namespace OpenRA.Network
+{
+	/* a maze of twisty little hacks,... */
+	public class Replay
+	{
+		public readonly string Filename;
+		public readonly int Duration;
+		public readonly Session LobbyInfo;
+
+		public Replay(string filename)
+		{
+			Filename = filename;
+			var lastFrame = 0;
+			var hasSeenGameStart = false;
+			var lobbyInfo = null as Session;
+
+			using (var conn = new ReplayConnection(filename))
+				conn.Receive((client, packet) =>
+					{
+						var frame = BitConverter.ToInt32(packet, 0);
+						if (packet.Length == 5 && packet[4] == 0xBF)
+							return;	// disconnect
+						else if (packet.Length >= 5 && packet[4] == 0x65)
+							return;	// sync
+						else if (frame == 0)
+						{
+							/* decode this to recover lobbyinfo, etc */
+							var orders = packet.ToOrderList(null);
+							foreach (var o in orders)
+								if (o.OrderString == "StartGame")
+									hasSeenGameStart = true;
+								else if (o.OrderString == "SyncInfo" && !hasSeenGameStart)
+									lobbyInfo = Session.Deserialize(o.TargetString);
+						}
+						else
+							lastFrame = Math.Max(lastFrame, frame);
+					});
+
+			Duration = lastFrame;
+			LobbyInfo = lobbyInfo;
+		}
+
+		public Map Map()
+		{
+			if (LobbyInfo == null)
+				return null;
+
+			var map = LobbyInfo.GlobalSettings.Map;
+			if (!Game.modData.AvailableMaps.ContainsKey(map))
+				return null;
+
+			return Game.modData.AvailableMaps[map];
+		}
+	}
+}
+

OpenRA.Game/Network/ReplayConnection.cs

@@ -109,6 +109,7 @@ namespace OpenRA.Network
 				return;
 
 			writer.Close();
+			inner.Dispose();
 			disposed = true;
 		}
 

OpenRA.Game/Network/Session.cs

@@ -37,17 +37,12 @@ namespace OpenRA.Network
 			return Slots.FirstOrDefault(s => !s.Value.Closed && ClientInSlot(s.Key) == null).Key;
 		}
 
-		public enum ClientState
-		{
-			NotReady,
-			Ready,
-			Disconnected = 1000
-		}
+		public enum ClientState { NotReady, Ready, Disconnected = 1000 }
 
 		public class Client
 		{
 			public int Index;
-            public ColorRamp ColorRamp;
+			public ColorRamp ColorRamp;
 			public string Country;
 			public int SpawnPoint;
 			public string Name;
@@ -55,6 +50,8 @@ namespace OpenRA.Network
 			public int Team;
 			public string Slot;	// slot ID, or null for observer
 			public string Bot; // Bot type, null for real clients
+
+			public bool IsReady { get { return State == ClientState.Ready; } }
 		}
 
 		public class Slot

OpenRA.Game/Network/SyncReport.cs

@@ -65,8 +65,8 @@ namespace OpenRA.Network
 							a.ActorID,
 							a.Type,
 							a.Owner,
-					        a.Trait,
-					        a.Hash
+							a.Trait,
+							a.Hash
 						));
 					return;
 				}

OpenRA.Game/Network/UnitOrders.cs

@@ -68,7 +68,7 @@ namespace OpenRA.Network
 							if (world == null)
 							{
 								if (client.Team == orderManager.LocalClient.Team)
-                                    Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + " (Team)",
+									Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + " (Team)",
 													 order.TargetString);
 							}
 							else
@@ -85,7 +85,7 @@ namespace OpenRA.Network
 									var suffix = (player != null && player.WinState == WinState.Lost)
 													 ? " (Dead)"
 													 : " (Team)";
-                                    Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
+									Game.AddChatLine(client.ColorRamp.GetColor(0), client.Name + suffix, order.TargetString);
 								}
 							}
 						}
@@ -94,42 +94,41 @@ namespace OpenRA.Network
 				case "StartGame":
 					{
 						Game.AddChatLine(Color.White, "Server", "The game has started.");
-						Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map);
+						Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, false);
 						break;
 					}
-
 				case "HandshakeRequest":
-				{
-					var request = HandshakeRequest.Deserialize(order.TargetString);
-
-					// Check that the map exists on the client
-					if (!Game.modData.AvailableMaps.ContainsKey(request.Map))
-						throw new InvalidOperationException("Missing map {0}".F(request.Map));
-
-					var info = new Session.Client()
 					{
-						Name = Game.Settings.Player.Name,
-						ColorRamp = Game.Settings.Player.ColorRamp,
-						Country = "random",
-						SpawnPoint = 0,
-						Team = 0,
-						State = Session.ClientState.NotReady
-					};
+						var request = HandshakeRequest.Deserialize(order.TargetString);
 
-					var localMods = orderManager.LobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray();
-					var response = new HandshakeResponse()
-					{
-						Client = info,
-						Mods = localMods,
-						Password = "Foo"
-					};
+						// Check that the map exists on the client
+						if (!Game.modData.AvailableMaps.ContainsKey(request.Map))
+							throw new InvalidOperationException("Missing map {0}".F(request.Map));
 
-					orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
-					break;
-				}
+						var info = new Session.Client()
+						{
+							Name = Game.Settings.Player.Name,
+							ColorRamp = Game.Settings.Player.ColorRamp,
+							Country = "random",
+							SpawnPoint = 0,
+							Team = 0,
+							State = Session.ClientState.NotReady
+						};
+
+						var localMods = orderManager.LobbyInfo.GlobalSettings.Mods.Select(m => "{0}@{1}".F(m,Mod.AllMods[m].Version)).ToArray();
+						var response = new HandshakeResponse()
+						{
+							Client = info,
+							Mods = localMods,
+							Password = "Foo"
+						};
+
+						orderManager.IssueOrder(Order.HandshakeResponse(response.Serialize()));
+						break;
+					}
 				case "ServerError":
 					orderManager.ServerError = order.TargetString;
-				break;
+					break;
 				case "SyncInfo":
 					{
 						orderManager.LobbyInfo = Session.Deserialize(order.TargetString);

OpenRA.Game/ObjectCreator.cs

@@ -52,7 +52,10 @@ namespace OpenRA
 			{
 				var type = mod.First.GetType( mod.Second + "." + className, false );
 				if( type == null ) continue;
-				var ctors = type.GetConstructors( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance ).Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
+				var flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
+				var ctors = type.GetConstructors( flags )
+					.Where( x => x.HasAttribute<UseCtorAttribute>() ).ToList();
+
 				if( ctors.Count == 0 )
 					return (T)CreateBasic( type );
 				else if( ctors.Count == 1 )
@@ -75,9 +78,7 @@ namespace OpenRA
 			var a = new object[ p.Length ];
 			for( int i = 0 ; i < p.Length ; i++ )
 			{
-				var attrs = p[ i ].GetCustomAttributes<ParamAttribute>();
-				if( attrs.Length != 1 ) throw new InvalidOperationException( "ObjectCreator: argument in [UseCtor] doesn't have [Param]" );
-				var key = attrs[ 0 ].ParamName ?? p[i].Name;
+				var key = p[i].Name;
 				if ( !args.ContainsKey(key) ) throw new InvalidOperationException("ObjectCreator: key `{0}' not found".F(key));
 				a[ i ] = args[ key ];
 			}
@@ -92,22 +93,7 @@ namespace OpenRA
 				.Where(t => t != it && it.IsAssignableFrom(t)));
 		}
 
-		[AttributeUsage( AttributeTargets.Parameter )]
-		public class ParamAttribute : Attribute
-		{
-			public string ParamName { get; private set; }
-
-			public ParamAttribute() { }
-
-			public ParamAttribute( string paramName )
-			{
-				ParamName = paramName;
-			}
-		}
-
 		[AttributeUsage( AttributeTargets.Constructor )]
-		public class UseCtorAttribute : Attribute
-		{
-		}
+		public class UseCtorAttribute : Attribute {}
 	}
 }

OpenRA.Game/OpenRA.Game.csproj

@@ -124,6 +124,7 @@
     <Compile Include="Network\Order.cs" />
     <Compile Include="Network\OrderIO.cs" />
     <Compile Include="Network\OrderManager.cs" />
+    <Compile Include="Network\Replay.cs" />
     <Compile Include="Network\ReplayConnection.cs" />
     <Compile Include="Network\ServerList.cs" />
     <Compile Include="Network\Session.cs" />
@@ -161,6 +162,7 @@
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Traits\Selectable.cs" />
+    <Compile Include="Traits\SelectionDecorations.cs" />
     <Compile Include="Traits\SubcellInit.cs" />
     <Compile Include="Traits\Target.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
@@ -182,12 +184,15 @@
     <Compile Include="Widgets\ChromeMetrics.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="Widgets\DropDownButtonWidget.cs" />
+    <Compile Include="Widgets\GridLayout.cs" />
     <Compile Include="Widgets\ImageWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
+    <Compile Include="Widgets\ListLayout.cs" />
     <Compile Include="Widgets\MapPreviewWidget.cs" />
     <Compile Include="Widgets\PasswordFieldWidget.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
     <Compile Include="Widgets\ProgressBarWidget.cs" />
+    <Compile Include="Widgets\ScrollItemWidget.cs" />
     <Compile Include="Widgets\ScrollPanelWidget.cs" />
     <Compile Include="Widgets\ShpImageWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
@@ -201,9 +206,6 @@
     <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
-    <Compile Include="Widgets\ScrollItemWidget.cs" />
-    <Compile Include="Widgets\ListLayout.cs" />
-    <Compile Include="Widgets\GridLayout.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
@@ -239,4 +241,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -19,30 +19,30 @@ namespace OpenRA.Orders
 	{
 		public IEnumerable<Order> Order( World world, int2 xy, MouseInput 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)
-                .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();
+			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())
+					TargetString = actorsInvolved.Select(a => a.ActorID).JoinWith(",")
 				};
 
 
-            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 ) { }

OpenRA.Game/Player.cs

@@ -36,9 +36,19 @@ namespace OpenRA
 		public readonly PlayerReference PlayerReference;
 		public bool IsBot;
 
-		public Shroud Shroud { get { return World.LocalShroud; }}
+		public Shroud Shroud { get { return World.LocalShroud; } }
 		public World World { get; private set; }
 
+		static CountryInfo ChooseCountry(World world, string name)
+		{
+			var selectableCountries = Rules.Info["world"].Traits
+				.WithInterface<CountryInfo>().Where( c => c.Selectable )
+				.ToArray();
+
+			return selectableCountries.FirstOrDefault(c => c.Race == name)
+				?? selectableCountries.Random(world.SharedRandom);
+		}
+
 		public Player(World world, Session.Client client, Session.Slot slot, PlayerReference pr)
 		{
 			World = world;
@@ -50,13 +60,10 @@ namespace OpenRA
 			if (client != null)
 			{
 				ClientIndex = client.Index;
-            	ColorRamp = client.ColorRamp;
+				ColorRamp = client.ColorRamp;
 				PlayerName = client.Name;
 				botType = client.Bot;
-
-				Country = world.GetCountries()
-					.FirstOrDefault(c => client.Country == c.Race)
-					?? world.GetCountries().Random(world.SharedRandom);
+				Country = ChooseCountry(world, client.Country);
 			}
 			else
 			{
@@ -66,10 +73,7 @@ namespace OpenRA
 				PlayerName = pr.Name;
 				NonCombatant = pr.NonCombatant;
 				botType = pr.Bot;
-
-				Country = world.GetCountries()
-					.FirstOrDefault(c => pr.Race == c.Race)
-					?? world.GetCountries().Random(world.SharedRandom);
+				Country = ChooseCountry(world, pr.Race);
 			}
 			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
 

OpenRA.Game/Server/Server.cs

@@ -46,10 +46,7 @@ namespace OpenRA.Server
 		public Map Map;
 
 		volatile bool shutdown = false;
-		public void Shutdown()
-		{
-			shutdown = true;
-		}
+		public void Shutdown() { shutdown = true; }
 
 		public Server(IPEndPoint endpoint, string[] mods, ServerSettings settings, ModData modData)
 		{
@@ -133,7 +130,7 @@ namespace OpenRA.Server
 		{
 			for (var i = 0; i < 256; i++)
 				if (conns.All(c => c.PlayerIndex != i) && preConns.All(c => c.PlayerIndex != i)
-				    && lobbyInfo.Clients.All(c => c.Index != i))
+					&& lobbyInfo.Clients.All(c => c.Index != i))
 					return i;
 
 			throw new InvalidOperationException("Already got 256 players");
@@ -198,9 +195,9 @@ namespace OpenRA.Server
 
 				// Check that the client has compatable mods
 				var valid = mods.All( m => m.Contains('@')) && //valid format
-				            mods.Count() == Game.CurrentMods.Count() &&  //same number
-				            mods.Select( m => Pair.New(m.Split('@')[0], m.Split('@')[1])).All(kv => Game.CurrentMods.ContainsKey(kv.First) &&
-				     		(kv.Second == "{DEV_VERSION}" || Game.CurrentMods[kv.First].Version == "{DEV_VERSION}" || kv.Second == Game.CurrentMods[kv.First].Version));
+							mods.Count() == Game.CurrentMods.Count() &&  //same number
+							mods.Select( m => Pair.New(m.Split('@')[0], m.Split('@')[1])).All(kv => Game.CurrentMods.ContainsKey(kv.First) &&
+					 		(kv.Second == "{DEV_VERSION}" || Game.CurrentMods[kv.First].Version == "{DEV_VERSION}" || kv.Second == Game.CurrentMods[kv.First].Version));
 				if (!valid)
 				{
 					Log.Write("server", "Rejected connection from {0}; mods do not match.",
@@ -241,7 +238,7 @@ namespace OpenRA.Server
 			if (pr == null)
 				return;
 			if (pr.LockColor)
-                c.ColorRamp = pr.ColorRamp;
+				c.ColorRamp = pr.ColorRamp;
 			if (pr.LockRace)
 				c.Country = pr.Race;
 			if (pr.LockSpawn)
@@ -319,15 +316,15 @@ namespace OpenRA.Server
 				new ServerOrder(order, data).Serialize());
 		}
 
-        public void SendChat(Connection asConn, string text)
-        {
-            DispatchOrders(asConn, 0, new ServerOrder("Chat", text).Serialize());
-        }
+		public void SendChat(Connection asConn, string text)
+		{
+			DispatchOrders(asConn, 0, new ServerOrder("Chat", text).Serialize());
+		}
 
-        public void SendDisconnected(Connection asConn)
-        {
-            DispatchOrders(asConn, 0, new ServerOrder("Disconnected", "").Serialize());
-        }
+		public void SendDisconnected(Connection asConn)
+		{
+			DispatchOrders(asConn, 0, new ServerOrder("Disconnected", "").Serialize());
+		}
 
 		void InterpretServerOrder(Connection conn, ServerOrder so)
 		{
@@ -374,8 +371,8 @@ namespace OpenRA.Server
 				conns.Remove(toDrop);
 				SendChat(toDrop, "Connection Dropped");
 
-            	if (GameStarted)
-                	SendDisconnected(toDrop); /* Report disconnection */
+				if (GameStarted)
+					SendDisconnected(toDrop); /* Report disconnection */
 
 				lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
 

OpenRA.Game/Server/TraitInterfaces.cs

@@ -7,6 +7,7 @@
  * see COPYING.
  */
 #endregion
+
 using System;
 using OpenRA.Network;
 

OpenRA.Game/Sound.cs

@@ -29,7 +29,7 @@ namespace OpenRA
 
 		static ISoundSource LoadSound(string filename)
 		{
-            return LoadSoundRaw(AudLoader.LoadSound(FileSystem.Open(filename)));
+			return LoadSoundRaw(AudLoader.LoadSound(FileSystem.Open(filename)));
 		}
 
 		static ISoundSource LoadSoundRaw(byte[] rawData)

OpenRA.Game/Support/Arguments.cs

@@ -33,27 +33,6 @@ namespace OpenRA
 		}
 
 		public bool Contains(string key) { return args.ContainsKey(key); }
-
 		public string GetValue(string key, string defaultValue) { return Contains(key) ? args[key] : defaultValue; }
-
-		public int GetValue(string key, int defaultValue)
-		{
-			int result;
-
-			if (!int.TryParse(GetValue(key, defaultValue.ToString()), out result))
-				result = defaultValue;
-
-			return result;
-		}
-
-		public bool GetValue(string key, bool defaultValue)
-		{
-			bool result;
-
-			if (!bool.TryParse(GetValue(key, defaultValue.ToString()), out result))
-				result = defaultValue;
-
-			return result;
-		}
 	}
 }

OpenRA.Game/Sync.cs

@@ -142,7 +142,7 @@ namespace OpenRA
 		public static T CheckSyncUnchanged<T>( World world, Func<T> fn )
 		{
 			if( world == null ) return fn();
-            var shouldCheckSync = Game.Settings.Debug.SanityCheckUnsyncedCode;
+			var shouldCheckSync = Game.Settings.Debug.SanityCheckUnsyncedCode;
 			int sync = shouldCheckSync ? world.SyncHash() : 0;
 			bool prevInUnsyncedCode = inUnsyncedCode;
 			inUnsyncedCode = true;

OpenRA.Game/Traits/Activity.cs

@@ -46,7 +46,9 @@ namespace OpenRA.Traits
 	{
 		public static IEnumerable<Target> GetTargetQueue( this Actor self )
 		{
-			return self.GetCurrentActivity().Iterate( u => u.NextActivity ).TakeWhile( u => u != null )
+			return self.GetCurrentActivity()
+				.Iterate( u => u.NextActivity )
+				.TakeWhile( u => u != null )
 				.SelectMany( u => u.GetTargets( self ) );
 		}
 	}

OpenRA.Game/Traits/DrawLineToTarget.cs

@@ -18,35 +18,29 @@ namespace OpenRA.Traits
 	{
 		public readonly int Ticks = 60;
 
-		public virtual object Create(ActorInitializer init) { return new DrawLineToTarget(this); }
+		public virtual object Create(ActorInitializer init) { return new DrawLineToTarget(init.self, this); }
 	}
 
 	public class DrawLineToTarget : IPostRenderSelection
 	{
+		Actor self;
 		DrawLineToTargetInfo Info;
-		public DrawLineToTarget(DrawLineToTargetInfo info)
-		{
-			this.Info = info;
-		}
-
 		Target target;
-		int lifetime;
 		Color c;
+		int lifetime;
 
-		public void SetTarget(Actor self, Target target, Color c)
-		{
-			this.target = target;
-			lifetime = Info.Ticks;
-			this.c = c;
-		}
+		public DrawLineToTarget(Actor self, DrawLineToTargetInfo info) { this.self = self; this.Info = info; }
 
-		public void SetTargetSilently(Actor self, Target target, Color c)
+		public void SetTarget(Actor self, Target target, Color c, bool display)
 		{
 			this.target = target;
 			this.c = c;
+
+			if (display)
+				lifetime = Info.Ticks;
 		}
 
-		public void RenderAfterWorld(WorldRenderer wr, Actor self)
+		public void RenderAfterWorld(WorldRenderer wr)
 		{
 			if (self.IsIdle) return;
 
@@ -57,19 +51,22 @@ namespace OpenRA.Traits
 			if (!target.IsValid)
 				return;
 
-			var p = target.CenterLocation;
 			var move = self.TraitOrDefault<IMove>();
 			var origin = move != null ? self.CenterLocation - new int2(0, move.Altitude) : self.CenterLocation;
 
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(origin, p, c, c);
-			for (bool b = false; !b; p = origin, b = true)
-			{
-				wlr.DrawLine(p + new float2(-1, -1), p + new float2(-1, 1), c, c);
-				wlr.DrawLine(p + new float2(-1, 1), p + new float2(1, 1), c, c);
-				wlr.DrawLine(p + new float2(1, 1), p + new float2(1, -1), c, c);
-				wlr.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c);
-			}
+
+			wlr.DrawLine(origin, target.CenterLocation, c, c);
+			DrawTargetMarker(wlr, target.CenterLocation);
+			DrawTargetMarker(wlr, origin);
+		}
+
+		void DrawTargetMarker(LineRenderer wlr, float2 p)
+		{
+			wlr.DrawLine(p + new float2(-1, -1), p + new float2(-1, 1), c, c);
+			wlr.DrawLine(p + new float2(-1, 1), p + new float2(1, 1), c, c);
+			wlr.DrawLine(p + new float2(1, 1), p + new float2(1, -1), c, c);
+			wlr.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c);
 		}
 	}
 
@@ -93,10 +90,7 @@ namespace OpenRA.Traits
 
 				var line = self.TraitOrDefault<DrawLineToTarget>();
 				if (line != null)
-					if (display)
-						line.SetTarget(self, target, color);
-					else
-						line.SetTargetSilently(self, target, color);
+					line.SetTarget(self, target, color, display);
 			});
 		}
 	}

OpenRA.Game/Traits/Health.cs

@@ -14,7 +14,7 @@ using OpenRA.GameRules;
 
 namespace OpenRA.Traits
 {
-	public class HealthInfo : ITraitInfo
+	public class HealthInfo : ITraitInfo, UsesInit<HealthInit>
 	{
 		public readonly int HP = 0;
 		public readonly float Radius = 10;
@@ -36,8 +36,8 @@ namespace OpenRA.Traits
 			Info = info;
 			MaxHP = info.HP;
 
-            hp = init.Contains<HealthInit>() ? (int)(init.Get<HealthInit, float>() * MaxHP) : MaxHP;
-            DisplayHp = hp;
+			hp = init.Contains<HealthInit>() ? (int)(init.Get<HealthInit, float>() * MaxHP) : MaxHP;
+			DisplayHp = hp;
 		}
 
 		public int HP { get { return hp; } }
@@ -75,7 +75,7 @@ namespace OpenRA.Traits
 
 			var oldState = this.DamageState;
 			/* apply the damage modifiers, if we have any. */
-            var modifier = (float)self.TraitsImplementing<IDamageModifier>()
+			var modifier = (float)self.TraitsImplementing<IDamageModifier>()
 				.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
 				.Select(t => t.GetDamageModifier(attacker, warhead)).Product();
 
@@ -93,8 +93,8 @@ namespace OpenRA.Traits
 				Warhead = warhead,
 			};
 
-            foreach (var nd in self.TraitsImplementing<INotifyDamage>()
-			         .Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyDamage>()))
+			foreach (var nd in self.TraitsImplementing<INotifyDamage>()
+					 .Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyDamage>()))
 				nd.Damaged(self, ai);
 
 			if (DamageState != oldState)
@@ -103,7 +103,7 @@ namespace OpenRA.Traits
 
 			if (attacker != null && attacker.IsInWorld && !attacker.IsDead())
 				foreach (var nd in attacker.TraitsImplementing<INotifyAppliedDamage>()
-			         .Concat(attacker.Owner.PlayerActor.TraitsImplementing<INotifyAppliedDamage>()))
+					 .Concat(attacker.Owner.PlayerActor.TraitsImplementing<INotifyAppliedDamage>()))
 				nd.AppliedDamage(attacker, self, ai);
 
 			if (hp == 0)
@@ -112,7 +112,7 @@ namespace OpenRA.Traits
 				self.Owner.Deaths++;
 
 				foreach (var nd in self.TraitsImplementing<INotifyKilled>()
-			    		.Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyKilled>()))
+						.Concat(self.Owner.PlayerActor.TraitsImplementing<INotifyKilled>()))
 					nd.Killed(self, ai);
 
 				if( RemoveOnDeath )

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -20,7 +20,7 @@ namespace OpenRA.Traits
 		public bool DisableShroud = false;
 		public bool PathDebug = false;
 		public bool UnlimitedPower;
-        public bool BuildAnywhere;
+		public bool BuildAnywhere;
 
 		public object Create (ActorInitializer init) { return new DeveloperMode(this); }
 	}
@@ -34,7 +34,7 @@ namespace OpenRA.Traits
 		[Sync] public bool DisableShroud;
 		[Sync] public bool PathDebug;
 		[Sync] public bool UnlimitedPower;
-        [Sync] public bool BuildAnywhere;
+		[Sync] public bool BuildAnywhere;
 
 		public DeveloperMode(DeveloperModeInfo info)
 		{
@@ -44,7 +44,7 @@ namespace OpenRA.Traits
 			DisableShroud = info.DisableShroud;
 			PathDebug = info.PathDebug;
 			UnlimitedPower = info.UnlimitedPower;
-            BuildAnywhere = info.BuildAnywhere;
+			BuildAnywhere = info.BuildAnywhere;
 		}
 
 		public void ResolveOrder (Actor self, Order order)
@@ -96,11 +96,11 @@ namespace OpenRA.Traits
 						UnlimitedPower ^= true;
 						break;
 					}
-                case "DevBuildAnywhere":
-                    {
-                        BuildAnywhere ^= true;
-                        break;
-                    }
+				case "DevBuildAnywhere":
+					{
+						BuildAnywhere ^= true;
+						break;
+					}
 				default:
 					return;
 			}

OpenRA.Game/Traits/Player/PlayerResources.cs

@@ -136,7 +136,7 @@ namespace OpenRA.Traits
 			var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
 
 			OreCapacity = self.World.ActorsWithTrait<IStoreOre>()
-                .Where(a => a.Actor.Owner == Owner)
+				.Where(a => a.Actor.Owner == Owner)
 				.Sum(a => a.Trait.Capacity);
 
 			if (Ore > OreCapacity)

OpenRA.Game/Traits/Selectable.cs

@@ -14,35 +14,32 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {
-	public class SelectableInfo : TraitInfo<Selectable>
+	public class SelectableInfo : ITraitInfo
 	{
 		public readonly int Priority = 10;
 		public readonly int[] Bounds = null;
-		[VoiceReference]
-		public readonly string Voice = null;
+		[VoiceReference] public readonly string Voice = null;
+
+		public object Create(ActorInitializer init) { return new Selectable(init.self); }
 	}
 
 	public class Selectable : IPostRenderSelection
 	{
-		// depends on the order of pips in TraitsInterfaces.cs!
-		static readonly string[] pipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue" };
-		static readonly string[] tagStrings = { "", "tag-fake", "tag-primary" };
+		Actor self;
 
-		public void RenderAfterWorld (WorldRenderer wr, Actor self)
+		public Selectable(Actor self) { this.self = self; }
+
+		public void RenderAfterWorld(WorldRenderer wr)
 		{
 			var bounds = self.Bounds.Value;
 
 			var xy = new float2(bounds.Left, bounds.Top);
 			var Xy = new float2(bounds.Right, bounds.Top);
-			var xY = new float2(bounds.Left, bounds.Bottom);
 
 			wr.DrawSelectionBox(self, Color.White);
 			DrawHealthBar(self, xy, Xy);
-			DrawControlGroup(wr, self, xy);
-			DrawPips(wr, self, xY);
-			DrawTags(wr, self, new float2(.5f * (bounds.Left + bounds.Right), bounds.Top));
-			DrawUnitPath(self);
 			DrawExtraBars(self, xy, Xy);
+			DrawUnitPath(self);
 		}
 
 		public void DrawRollover(WorldRenderer wr, Actor self)
@@ -139,83 +136,6 @@ namespace OpenRA.Traits
 			}
 		}
 
-		void DrawControlGroup(WorldRenderer wr, Actor self, float2 basePosition)
-		{
-			var group = self.World.Selection.GetControlGroupForActor(self);
-			if (group == null) return;
-
-			var pipImages = new Animation("pips");
-			pipImages.PlayFetchIndex("groups", () => (int)group);
-			pipImages.Tick();
-			pipImages.Image.DrawAt(wr, basePosition + new float2(-8, 1), "chrome");
-		}
-
-		void DrawPips(WorldRenderer wr, Actor self, float2 basePosition)
-		{
-			if (self.Owner != self.World.LocalPlayer) return;
-
-			var pipSources = self.TraitsImplementing<IPips>();
-			if (pipSources.Count() == 0)
-				return;
-
-			var pipImages = new Animation("pips");
-			pipImages.PlayRepeating(pipStrings[0]);
-
-			var pipSize = pipImages.Image.size;
-			var pipxyBase = basePosition + new float2(1, -pipSize.Y);
-			var pipxyOffset = new float2(0, 0); // Correct for offset due to multiple columns/rows
-
-			foreach (var pips in pipSources)
-			{
-				var thisRow = pips.GetPips(self);
-				if (thisRow == null)
-					continue;
-
-				var width = self.Bounds.Value.Width;
-
-				foreach (var pip in thisRow)
-				{
-					if (pipxyOffset.X + pipSize.X >= width)
-					{
-						pipxyOffset.X = 0;
-						pipxyOffset.Y -= pipSize.Y;
-					}
-					pipImages.PlayRepeating(pipStrings[(int)pip]);
-					pipImages.Image.DrawAt(wr, pipxyBase + pipxyOffset, "chrome");
-					pipxyOffset += new float2(pipSize.X, 0);
-				}
-
-				// Increment row
-				pipxyOffset.X = 0;
-				pipxyOffset.Y -= pipSize.Y + 1;
-			}
-		}
-
-		void DrawTags(WorldRenderer wr, Actor self, float2 basePosition)
-		{
-			if (self.Owner != self.World.LocalPlayer) return;
-
-			// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
-			var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file
-			var tagxyOffset = new float2(0, 0); // Correct for offset due to multiple rows
-
-			foreach (var tags in self.TraitsImplementing<ITags>())
-			{
-				foreach (var tag in tags.GetTags())
-				{
-					if (tag == TagType.None)
-						continue;
-
-					var tagImages = new Animation("pips");
-					tagImages.PlayRepeating(tagStrings[(int)tag]);
-					tagImages.Image.DrawAt(wr, tagxyBase + tagxyOffset, "chrome");
-
-					// Increment row
-					tagxyOffset.Y += 8;
-				}
-			}
-		}
-
 		void DrawUnitPath(Actor self)
 		{
 			if (self.World.LocalPlayer == null ||!self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug) return;

OpenRA.Game/Traits/SelectionDecorations.cs

@@ -0,0 +1,123 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Drawing;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA.Traits
+{
+	public class SelectionDecorationsInfo : ITraitInfo
+	{
+		public object Create(ActorInitializer init) { return new SelectionDecorations(init.self); }
+	}
+
+	public class SelectionDecorations : IPostRenderSelection
+	{
+		// depends on the order of pips in TraitsInterfaces.cs!
+		static readonly string[] pipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue" };
+		static readonly string[] tagStrings = { "", "tag-fake", "tag-primary" };
+
+		Actor self;
+
+		public SelectionDecorations(Actor self) { this.self = self; }
+
+		public void RenderAfterWorld(WorldRenderer wr)
+		{
+			var bounds = self.Bounds.Value;
+
+			var xy = new float2(bounds.Left, bounds.Top);
+			var xY = new float2(bounds.Left, bounds.Bottom);
+
+			DrawControlGroup(wr, self, xy);
+			DrawPips(wr, self, xY);
+			DrawTags(wr, self, new float2(.5f * (bounds.Left + bounds.Right), bounds.Top));
+		}
+
+		void DrawControlGroup(WorldRenderer wr, Actor self, float2 basePosition)
+		{
+			var group = self.World.Selection.GetControlGroupForActor(self);
+			if (group == null) return;
+
+			var pipImages = new Animation("pips");
+			pipImages.PlayFetchIndex("groups", () => (int)group);
+			pipImages.Tick();
+			pipImages.Image.DrawAt(wr, basePosition + new float2(-8, 1), "chrome");
+		}
+
+		void DrawPips(WorldRenderer wr, Actor self, float2 basePosition)
+		{
+			if (self.Owner != self.World.LocalPlayer) return;
+
+			var pipSources = self.TraitsImplementing<IPips>();
+			if (pipSources.Count() == 0)
+				return;
+
+			var pipImages = new Animation("pips");
+			pipImages.PlayRepeating(pipStrings[0]);
+
+			var pipSize = pipImages.Image.size;
+			var pipxyBase = basePosition + new float2(1, -pipSize.Y);
+			var pipxyOffset = new float2(0, 0); // Correct for offset due to multiple columns/rows
+
+			foreach (var pips in pipSources)
+			{
+				var thisRow = pips.GetPips(self);
+				if (thisRow == null)
+					continue;
+
+				var width = self.Bounds.Value.Width;
+
+				foreach (var pip in thisRow)
+				{
+					if (pipxyOffset.X + pipSize.X >= width)
+					{
+						pipxyOffset.X = 0;
+						pipxyOffset.Y -= pipSize.Y;
+					}
+					pipImages.PlayRepeating(pipStrings[(int)pip]);
+					pipImages.Image.DrawAt(wr, pipxyBase + pipxyOffset, "chrome");
+					pipxyOffset += new float2(pipSize.X, 0);
+				}
+
+				// Increment row
+				pipxyOffset.X = 0;
+				pipxyOffset.Y -= pipSize.Y + 1;
+			}
+		}
+
+		void DrawTags(WorldRenderer wr, Actor self, float2 basePosition)
+		{
+			if (self.Owner != self.World.LocalPlayer) return;
+
+			// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
+			var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file
+			var tagxyOffset = new float2(0, 0); // Correct for offset due to multiple rows
+
+			foreach (var tags in self.TraitsImplementing<ITags>())
+			{
+				foreach (var tag in tags.GetTags())
+				{
+					if (tag == TagType.None)
+						continue;
+
+					var tagImages = new Animation("pips");
+					tagImages.PlayRepeating(tagStrings[(int)tag]);
+					tagImages.Image.DrawAt(wr, tagxyBase + tagxyOffset, "chrome");
+
+					// Increment row
+					tagxyOffset.Y += 8;
+				}
+			}
+		}
+
+	}
+}
+

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -18,117 +18,117 @@ using OpenRA.Network;
 
 namespace OpenRA.Traits
 {
-    // depends on the order of pips in WorldRenderer.cs!
-    public enum PipType { Transparent, Green, Yellow, Red, Gray, Blue };
-    public enum TagType { None, Fake, Primary };
-    public enum Stance { Enemy, Neutral, Ally };
+	// depends on the order of pips in WorldRenderer.cs!
+	public enum PipType { Transparent, Green, Yellow, Red, Gray, Blue };
+	public enum TagType { None, Fake, Primary };
+	public enum Stance { Enemy, Neutral, Ally };
 
-    public class AttackInfo
-    {
-        public Actor Attacker;
-        public WarheadInfo Warhead;
-        public int Damage;
-        public DamageState DamageState;
-        public DamageState PreviousDamageState;
-    }
+	public class AttackInfo
+	{
+		public Actor Attacker;
+		public WarheadInfo Warhead;
+		public int Damage;
+		public DamageState DamageState;
+		public DamageState PreviousDamageState;
+	}
 
-    public interface ITick { void Tick(Actor self); }
-    public interface IRender { IEnumerable<Renderable> Render(Actor self); }
+	public interface ITick { void Tick(Actor self); }
+	public interface IRender { IEnumerable<Renderable> Render(Actor self); }
 
-    public interface IIssueOrder
-    {
-        IEnumerable<IOrderTargeter> Orders { get; }
-        Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued);
-    }
+	public interface IIssueOrder
+	{
+		IEnumerable<IOrderTargeter> Orders { get; }
+		Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued);
+	}
 
-    public interface IOrderTargeter
-    {
-        string OrderID { get; }
-        int OrderPriority { get; }
-        bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueue, ref string cursor);
-        bool CanTargetLocation(Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueue, ref string cursor);
-        bool IsQueued { get; }
-    }
+	public interface IOrderTargeter
+	{
+		string OrderID { get; }
+		int OrderPriority { get; }
+		bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueue, ref string cursor);
+		bool CanTargetLocation(Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueue, ref string cursor);
+		bool IsQueued { get; }
+	}
 
-    public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
-    public interface IValidateOrder { bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order); }
-    public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
-    public interface INotifySold { void Selling(Actor self); void Sold(Actor self); }
-    public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
-    public interface INotifyDamageStateChanged { void DamageStateChanged(Actor self, AttackInfo e); }
-    public interface INotifyKilled { void Killed(Actor self, AttackInfo e); }
-    public interface INotifyAppliedDamage { void AppliedDamage(Actor self, Actor damaged, AttackInfo e); }
-    public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
-    public interface INotifyProduction { void UnitProduced(Actor self, Actor other, int2 exit); }
-    public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
-    public interface INotifyOtherCaptured { void OnActorCaptured(Actor self, Actor captured, Actor captor, Player oldOwner, Player newOwner); }
-    public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
-    public interface IStoreOre { int Capacity { get; } }
-    public interface IToolTip
-    {
-        string Name();
-        Player Owner();
-        Stance Stance();
-    }
+	public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
+	public interface IValidateOrder { bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order); }
+	public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }
+	public interface INotifySold { void Selling(Actor self); void Sold(Actor self); }
+	public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
+	public interface INotifyDamageStateChanged { void DamageStateChanged(Actor self, AttackInfo e); }
+	public interface INotifyKilled { void Killed(Actor self, AttackInfo e); }
+	public interface INotifyAppliedDamage { void AppliedDamage(Actor self, Actor damaged, AttackInfo e); }
+	public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
+	public interface INotifyProduction { void UnitProduced(Actor self, Actor other, int2 exit); }
+	public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); }
+	public interface INotifyOtherCaptured { void OnActorCaptured(Actor self, Actor captured, Actor captor, Player oldOwner, Player newOwner); }
+	public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
+	public interface IStoreOre { int Capacity { get; } }
+	public interface IToolTip
+	{
+		string Name();
+		Player Owner();
+		Stance Stance();
+	}
 
-    public interface IDisable { bool Disabled { get; } }
-    public interface IExplodeModifier { bool ShouldExplode(Actor self); }
-    public interface IHuskModifier { string HuskActor(Actor self); }
-    public interface INudge { void OnNudge(Actor self, Actor nudger, bool force); }
+	public interface IDisable { bool Disabled { get; } }
+	public interface IExplodeModifier { bool ShouldExplode(Actor self); }
+	public interface IHuskModifier { string HuskActor(Actor self); }
+	public interface INudge { void OnNudge(Actor self, Actor nudger, bool force); }
 
-    public interface IRadarSignature
-    {
-        IEnumerable<int2> RadarSignatureCells(Actor self);
-        Color RadarSignatureColor(Actor self);
-    }
+	public interface IRadarSignature
+	{
+		IEnumerable<int2> RadarSignatureCells(Actor self);
+		Color RadarSignatureColor(Actor self);
+	}
 
-    public interface IVisibilityModifier { bool IsVisible(Actor self); }
-    public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
+	public interface IVisibilityModifier { bool IsVisible(Actor self); }
+	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
 	public interface IHasLocation { int2 PxPosition { get; } }
 
-    public interface IOccupySpace : IHasLocation
-    {
-        int2 TopLeft { get; }
-        IEnumerable<Pair<int2, SubCell>> OccupiedCells();
-    }
+	public interface IOccupySpace : IHasLocation
+	{
+		int2 TopLeft { get; }
+		IEnumerable<Pair<int2, SubCell>> OccupiedCells();
+	}
 
-    public static class IOccupySpaceExts
-    {
-        public static int2 NearestCellTo(this IOccupySpace ios, int2 other)
-        {
-            var nearest = ios.TopLeft;
-            var nearestDistance = int.MaxValue;
-            foreach (var cell in ios.OccupiedCells())
-            {
-                var dist = (other - cell.First).LengthSquared;
-                if (dist < nearestDistance)
-                {
-                    nearest = cell.First;
-                    nearestDistance = dist;
-                }
-            }
-            return nearest;
-        }
-    }
+	public static class IOccupySpaceExts
+	{
+		public static int2 NearestCellTo(this IOccupySpace ios, int2 other)
+		{
+			var nearest = ios.TopLeft;
+			var nearestDistance = int.MaxValue;
+			foreach (var cell in ios.OccupiedCells())
+			{
+				var dist = (other - cell.First).LengthSquared;
+				if (dist < nearestDistance)
+				{
+					nearest = cell.First;
+					nearestDistance = dist;
+				}
+			}
+			return nearest;
+		}
+	}
 
-    public interface INotifyAttack { void Attacking(Actor self, Target target); }
-    public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
-    public interface IDamageModifier { float GetDamageModifier(Actor attacker, WarheadInfo warhead); }
-    public interface ISpeedModifier { decimal GetSpeedModifier(); }
-    public interface IFirepowerModifier { float GetFirepowerModifier(); }
-    public interface IPalette { void InitPalette(WorldRenderer wr); }
-    public interface IPaletteModifier { void AdjustPalette(Dictionary<string, Palette> b); }
-    public interface IPips { IEnumerable<PipType> GetPips(Actor self); }
-    public interface ITags { IEnumerable<TagType> GetTags(); }
-    public interface ISelectionBar { float GetValue(); Color GetColor(); }
+	public interface INotifyAttack { void Attacking(Actor self, Target target); }
+	public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
+	public interface IDamageModifier { float GetDamageModifier(Actor attacker, WarheadInfo warhead); }
+	public interface ISpeedModifier { decimal GetSpeedModifier(); }
+	public interface IFirepowerModifier { float GetFirepowerModifier(); }
+	public interface IPalette { void InitPalette(WorldRenderer wr); }
+	public interface IPaletteModifier { void AdjustPalette(Dictionary<string, Palette> b); }
+	public interface IPips { IEnumerable<PipType> GetPips(Actor self); }
+	public interface ITags { IEnumerable<TagType> GetTags(); }
+	public interface ISelectionBar { float GetValue(); Color GetColor(); }
 
-    public interface ITeleportable : IHasLocation /* crap name! */
-    {
-        bool CanEnterCell(int2 location);
-        void SetPosition(Actor self, int2 cell);
-        void SetPxPosition(Actor self, int2 px);
-        void AdjustPxPosition(Actor self, int2 px);	/* works like SetPxPosition, but visual only */
-    }
+	public interface ITeleportable : IHasLocation /* crap name! */
+	{
+		bool CanEnterCell(int2 location);
+		void SetPosition(Actor self, int2 cell);
+		void SetPxPosition(Actor self, int2 px);
+		void AdjustPxPosition(Actor self, int2 px);	/* works like SetPxPosition, but visual only */
+	}
 
 	public interface IMove : ITeleportable { int Altitude { get; set; } }
 
@@ -141,86 +141,87 @@ namespace OpenRA.Traits
 
 	public interface IFacingInfo {}		/* tag interface for infoclasses whose corresponding trait has IFacing */
 
-    public interface ICrushable
-    {
-        void OnCrush(Actor crusher);
+	public interface ICrushable
+	{
+		void OnCrush(Actor crusher);
 		void WarnCrush(Actor crusher);
 		bool CrushableBy(string[] crushClasses, Player owner);
-    }
+	}
 
-    public struct Renderable
-    {
-        public readonly Sprite Sprite;
-        public readonly float2 Pos;
-        public readonly string Palette;
-        public readonly int Z;
-        public readonly int ZOffset;
-        public float Scale;
+	public struct Renderable
+	{
+		public readonly Sprite Sprite;
+		public readonly float2 Pos;
+		public readonly string Palette;
+		public readonly int Z;
+		public readonly int ZOffset;
+		public float Scale;
 
-        public Renderable(Sprite sprite, float2 pos, string palette, int z, int zOffset, float scale)
-        {
-            Sprite = sprite;
-            Pos = pos;
-            Palette = palette;
-            Z = z;
-            ZOffset = zOffset;
-            Scale = scale; /* default */
-        }
+		public Renderable(Sprite sprite, float2 pos, string palette, int z, int zOffset, float scale)
+		{
+			Sprite = sprite;
+			Pos = pos;
+			Palette = palette;
+			Z = z;
+			ZOffset = zOffset;
+			Scale = scale; /* default */
+		}
 
-        public Renderable(Sprite sprite, float2 pos, string palette, int z)
-            : this(sprite, pos, palette, z, 0, 1f) { }
+		public Renderable(Sprite sprite, float2 pos, string palette, int z)
+			: this(sprite, pos, palette, z, 0, 1f) { }
 
-        public Renderable(Sprite sprite, float2 pos, string palette, int z, float scale)
-            : this(sprite, pos, palette, z, 0, scale) { }
+		public Renderable(Sprite sprite, float2 pos, string palette, int z, float scale)
+			: this(sprite, pos, palette, z, 0, scale) { }
 
-        public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, Palette, Z, ZOffset, newScale); }
-        public Renderable WithPalette(string newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
-        public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, Palette, Z, newOffset, Scale); }
-        public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); }
-    }
+		public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, Palette, Z, ZOffset, newScale); }
+		public Renderable WithPalette(string newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
+		public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, Palette, Z, newOffset, Scale); }
+		public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); }
+	}
 
-    public interface ITraitInfo { object Create(ActorInitializer init); }
+	public interface ITraitInfo { object Create(ActorInitializer init); }
 
-    public class TraitInfo<T> : ITraitInfo where T : new() { public virtual object Create(ActorInitializer init) { return new T(); } }
+	public class TraitInfo<T> : ITraitInfo where T : new() { public virtual object Create(ActorInitializer init) { return new T(); } }
 
-    public interface Requires<T> where T : class { }
+	public interface Requires<T> where T : class { }
+	public interface UsesInit<T> where T : IActorInit { }
 
-    public interface INotifySelection { void SelectionChanged(); }
-    public interface IWorldLoaded { void WorldLoaded(World w); }
-    public interface ICreatePlayers { void CreatePlayers(World w); }
+	public interface INotifySelection { void SelectionChanged(); }
+	public interface IWorldLoaded { void WorldLoaded(World w); }
+	public interface ICreatePlayers { void CreatePlayers(World w); }
 
-    public interface IBotInfo { string Name { get; } }
-    public interface IBot
-    {
-        void Activate(Player p);
-        IBotInfo Info { get; }
-    }
+	public interface IBotInfo { string Name { get; } }
+	public interface IBot
+	{
+		void Activate(Player p);
+		IBotInfo Info { get; }
+	}
 
-    public interface IRenderOverlay { void Render(WorldRenderer wr); }
-    public interface INotifyIdle { void TickIdle(Actor self); }
+	public interface IRenderOverlay { void Render(WorldRenderer wr); }
+	public interface INotifyIdle { void TickIdle(Actor self); }
 
-    public interface IBlocksBullets { }
+	public interface IBlocksBullets { }
 
-    public interface IPostRender { void RenderAfterWorld(WorldRenderer wr, Actor self); }
+	public interface IPostRender { void RenderAfterWorld(WorldRenderer wr, Actor self); }
 
-    public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr, Actor self); }
-    public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); }
-    public interface IRenderAsTerrain { IEnumerable<Renderable> RenderAsTerrain(Actor self); }
+	public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr); }
+	public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); }
+	public interface IRenderAsTerrain { IEnumerable<Renderable> RenderAsTerrain(Actor self); }
 
-    public interface ITargetable
-    {
-        string[] TargetTypes { get; }
-        IEnumerable<int2> TargetableCells(Actor self);
-        bool TargetableBy(Actor self, Actor byActor);
-    }
+	public interface ITargetable
+	{
+		string[] TargetTypes { get; }
+		IEnumerable<int2> TargetableCells(Actor self);
+		bool TargetableBy(Actor self, Actor byActor);
+	}
 
-    public interface INotifyStanceChanged
-    {
-        void StanceChanged(Actor self, Player a, Player b,
-            Stance oldStance, Stance newStance);
-    }
+	public interface INotifyStanceChanged
+	{
+		void StanceChanged(Actor self, Player a, Player b,
+			Stance oldStance, Stance newStance);
+	}
 
-    public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning); }
+	public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning); }
 
 	public interface IObjectivesPanel { string ObjectivesPanel { get; } }
 }

OpenRA.Game/Traits/Util.cs

@@ -122,17 +122,17 @@ namespace OpenRA.Traits
 
 		public static int2 CellContaining(float2 pos) { return (1f / Game.CellSize * pos).ToInt2(); }
 
-        /* pretty crap */
-        public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> ts, Thirdparty.Random random)
-        {
-            var items = ts.ToList();
-            while (items.Count > 0)
-            {
-                var t = items.Random(random);
-                yield return t;
-                items.Remove(t);
-            }
-        }
+		/* pretty crap */
+		public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> ts, Thirdparty.Random random)
+		{
+			var items = ts.ToList();
+			while (items.Count > 0)
+			{
+				var t = items.Random(random);
+				yield return t;
+				items.Remove(t);
+			}
+		}
 
 		static IEnumerable<int2> Neighbours(int2 c, bool allowDiagonal)
 		{

OpenRA.Game/Traits/ValidateOrder.cs

@@ -15,10 +15,10 @@ namespace OpenRA.Traits
 {
 	public class ValidateOrderInfo : TraitInfo<ValidateOrder> { }
 
-    public class ValidateOrder : IValidateOrder
-    {
-        public bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order)
-        {
+	public class ValidateOrder : IValidateOrder
+	{
+		public bool OrderValidation(OrderManager orderManager, World world, int clientId, Order order)
+		{
 			if (order.Subject == null || order.Subject.Owner == null)
 				return true;
 
@@ -36,12 +36,12 @@ namespace OpenRA.Traits
 
 			// Drop exploiting orders
 			if (subjectClientId != clientId && !isBotOrder)
-            {
-                Game.Debug("Detected exploit order from client {0}: {1}", clientId, order.OrderString);
-                return false;
-            }
+			{
+				Game.Debug("Detected exploit order from client {0}: {1}", clientId, order.OrderString);
+				return false;
+			}
 
-            return true;
-        }
-    }
+			return true;
+		}
+	}
 }

OpenRA.Game/Traits/World/Country.cs

@@ -14,8 +14,7 @@ namespace OpenRA.Traits
 	{
 		public readonly string Name = null;
 		public readonly string Race = null;
-
-		/* todo: icon,... */
+		public readonly bool Selectable = true;
 	}
 
 	public class Country { /* we're only interested in the Info */ }

OpenRA.Game/Traits/World/PlayerColorPalette.cs

@@ -37,7 +37,7 @@ namespace OpenRA.Traits
 		{
 			var paletteName = "{0}{1}".F( info.BaseName, owner.InternalName );
 			var newpal = new Palette(wr.GetPalette(info.BasePalette),
-			                 new PlayerColorRemap(owner.ColorRamp, info.PaletteFormat));
+							 new PlayerColorRemap(info.PaletteFormat, owner.ColorRamp));
 			wr.AddPalette(paletteName, newpal);
 		}
 	}

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -64,16 +64,16 @@ namespace OpenRA.Traits
 			for (int x = map.Bounds.Left; x < map.Bounds.Right; x++)
 				for (int y = map.Bounds.Top; y < map.Bounds.Bottom; y++)
 				{
-                    var type = resourceTypes.FirstOrDefault(
+					var type = resourceTypes.FirstOrDefault(
 						r => r.info.ResourceType == w.Map.MapResources.Value[x, y].type);
 
-                    if (type == null)
-                        continue;
+					if (type == null)
+						continue;
 
 					if (!AllowResourceAt(type, new int2(x,y)))
 						continue;
 
-                    content[x, y].type = type;
+					content[x, y].type = type;
 					content[x, y].image = ChooseContent(type);
 				}
 
@@ -86,13 +86,13 @@ namespace OpenRA.Traits
 					}
 		}
 
-        public bool AllowResourceAt(ResourceType rt, int2 a)
-        {
-            if (!world.Map.IsInMap(a.X, a.Y)) return false;
-            if (!rt.info.AllowedTerrainTypes.Contains(world.GetTerrainInfo(a).Type)) return false;
-            if (!rt.info.AllowUnderActors && world.ActorMap.AnyUnitsAt(a)) return false;
-            return true;
-        }
+		public bool AllowResourceAt(ResourceType rt, int2 a)
+		{
+			if (!world.Map.IsInMap(a.X, a.Y)) return false;
+			if (!rt.info.AllowedTerrainTypes.Contains(world.GetTerrainInfo(a).Type)) return false;
+			if (!rt.info.AllowUnderActors && world.ActorMap.AnyUnitsAt(a)) return false;
+			return true;
+		}
 
 		Sprite[] ChooseContent(ResourceType t)
 		{

OpenRA.Game/Traits/World/ResourceType.cs

@@ -22,8 +22,8 @@ namespace OpenRA.Traits
 		public readonly string Name = null;
 		public readonly string TerrainType = "Ore";
 
-        public readonly string[] AllowedTerrainTypes = { };
-        public readonly bool AllowUnderActors = false;
+		public readonly string[] AllowedTerrainTypes = { };
+		public readonly bool AllowUnderActors = false;
 
 		public Sprite[][] Sprites;
 		public int PaletteIndex;

OpenRA.Game/Traits/World/ScreenShaker.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Traits
 	public class ScreenShaker : ITick
 	{
 		int ticks = 0;
-        List<ShakeEffect> shakeEffects = new List<ShakeEffect>();
+		List<ShakeEffect> shakeEffects = new List<ShakeEffect>();
 
 		public void Tick (Actor self)
 		{

OpenRA.Game/Traits/World/Shroud.cs

@@ -78,7 +78,7 @@ namespace OpenRA.Traits
 				return;
 
 			if (a.Owner == null || a.Owner.World.LocalPlayer == null
-			    || a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
+				|| a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
 
 			if (vis.ContainsKey(a))
 			{
@@ -160,7 +160,7 @@ namespace OpenRA.Traits
 		public void UpdateActor(Actor a)
 		{
 			if (a.Owner == null || a.Owner.World.LocalPlayer == null
-			    || a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
+				|| a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
 
 			RemoveActor(a); AddActor(a);
 		}

OpenRA.Game/Widgets/ButtonWidget.cs

@@ -27,7 +27,7 @@ namespace OpenRA.Widgets
 		public Func<string> GetText;
 		public Func<bool> IsDisabled = () => false;
 		public Action<MouseInput> OnMouseDown = _ => {};
-        public Action<MouseInput> OnMouseUp = _ => {};
+		public Action<MouseInput> OnMouseUp = _ => {};
 
 		// Equivalent to OnMouseUp, but without an input arg
 		public Action OnClick = () => {};
@@ -130,7 +130,7 @@ namespace OpenRA.Widgets
 
 			DrawBackground(rb, disabled, Depressed, Widget.MouseOverWidget == this);
 			font.DrawText(text, new int2(rb.X + (UsableWidth - s.X)/ 2, rb.Y + (Bounds.Height - s.Y) / 2) + stateOffset,
-			              disabled ? Color.Gray : Color.White);
+						  disabled ? Color.Gray : Color.White);
 		}
 
 		public override Widget Clone() { return new ButtonWidget(this); }

OpenRA.Game/Widgets/ChatDisplayWidget.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Widgets
 	public class ChatDisplayWidget : Widget
 	{
 		public readonly int RemoveTime = 0;
-        public readonly bool UseContrast = false;
+		public readonly bool UseContrast = false;
 
 		const int logLength = 9;
 		public string Notification = "";
@@ -55,11 +55,11 @@ namespace OpenRA.Widgets
 					inset = font.Measure(owner).X + 10;
 
 					font.DrawTextWithContrast(owner, chatpos,
-                        line.Color, Color.Black, UseContrast ? 1 : 0);
+						line.Color, Color.Black, UseContrast ? 1 : 0);
 				}
 
-                font.DrawTextWithContrast(line.Text, chatpos + new int2(inset, 0),
-                    Color.White, Color.Black, UseContrast ? 1 : 0);
+				font.DrawTextWithContrast(line.Text, chatpos + new int2(inset, 0),
+					Color.White, Color.Black, UseContrast ? 1 : 0);
 			}
 
 			Game.Renderer.DisableScissor();

OpenRA.Game/Widgets/ChatEntryWidget.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -21,12 +21,12 @@ namespace OpenRA.Widgets
 		string content = "";
 		bool composing = false;
 		bool teamChat = false;
-        public readonly bool UseContrast = false;
+		public readonly bool UseContrast = false;
 
 		readonly OrderManager orderManager;
 
 		[ObjectCreator.UseCtor]
-		internal ChatEntryWidget( [ObjectCreator.Param] OrderManager orderManager )
+		internal ChatEntryWidget(   OrderManager orderManager )
 		{
 			this.orderManager = orderManager;
 		}

OpenRA.Game/Widgets/DropDownButtonWidget.cs

@@ -79,7 +79,7 @@ namespace OpenRA.Widgets
 			Widget.RootWidget.AddChild(panel);
 		}
 
-		public void ShowDropDown<T>(string panelTemplate, int height, List<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
+		public void ShowDropDown<T>(string panelTemplate, int height, IEnumerable<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
 		{
 			var substitutions = new Dictionary<string,int>() {{ "DROPDOWN_WIDTH", Bounds.Width }};
 			var panel = (ScrollPanelWidget)Widget.LoadWidget(panelTemplate, null, new WidgetArgs()
@@ -104,27 +104,27 @@ namespace OpenRA.Widgets
 	}
 
 	public class MaskWidget : Widget
-    {
-       	public Action<MouseInput> OnMouseDown = _ => {};
+	{
+	   	public Action<MouseInput> OnMouseDown = _ => {};
 		public MaskWidget() : base() { }
-        public MaskWidget(MaskWidget other)
-            : base(other)
+		public MaskWidget(MaskWidget other)
+			: base(other)
 		{
 			OnMouseDown = other.OnMouseDown;
 		}
 
 		public override bool HandleMouseInput(MouseInput mi)
-        {
-            if (mi.Event != MouseInputEvent.Down && mi.Event != MouseInputEvent.Up)
+		{
+			if (mi.Event != MouseInputEvent.Down && mi.Event != MouseInputEvent.Up)
 				return false;
 
 			if (mi.Event == MouseInputEvent.Down)
 				OnMouseDown(mi);
 
 			return true;
-        }
+		}
 
-        public override string GetCursor(int2 pos) { return null; }
-        public override Widget Clone() { return new MaskWidget(this); }
-    }
+		public override string GetCursor(int2 pos) { return null; }
+		public override Widget Clone() { return new MaskWidget(this); }
+	}
 }

OpenRA.Game/Widgets/MapPreviewWidget.cs

@@ -38,19 +38,20 @@ namespace OpenRA.Widgets
 		public override Widget Clone() { return new MapPreviewWidget(this); }
 
 		public override bool HandleMouseInput(MouseInput mi)
-        {
+		{
 			if (IgnoreMouseInput)
 				return base.HandleMouseInput(mi);
 
 			if (mi.Event != MouseInputEvent.Down)
 				return false;
 
-            OnMouseDown(mi);
-            return true;
-        }
+			OnMouseDown(mi);
+			return true;
+		}
 
-		public int2 ConvertToPreview(Map map, int2 point)
+		public int2 ConvertToPreview(int2 point)
 		{
+			var map = Map();
 			return new int2(MapRect.X + (int)(PreviewScale*(point.X - map.Bounds.Left)) , MapRect.Y + (int)(PreviewScale*(point.Y - map.Bounds.Top)));
 		}
 
@@ -91,10 +92,10 @@ namespace OpenRA.Widgets
 
 			// Overlay spawnpoints
 			var colors = SpawnColors();
-			foreach (var p in map.SpawnPoints)
+			foreach (var p in map.GetSpawnPoints())
 			{
 				var owned = colors.ContainsKey(p);
-				var pos = ConvertToPreview(map, p);
+				var pos = ConvertToPreview(p);
 				var sprite = ChromeProvider.GetImage("spawnpoints", owned ? "owned" : "unowned");
 				var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2);
 

OpenRA.Game/Widgets/PerfGraphWidget.cs

@@ -27,7 +27,7 @@ namespace OpenRA.Widgets
 			Game.Renderer.LineRenderer.DrawLine(origin, origin + new float2(100, 0) * basis, Color.White, Color.White);
 			Game.Renderer.LineRenderer.DrawLine(origin + new float2(100, 0) * basis, origin + new float2(100, 100) * basis, Color.White, Color.White);
 
-            int k = 0;
+			int k = 0;
 			foreach (var item in PerfHistory.items.Values.ToArray())
 			{
 				int n = 0;
@@ -41,19 +41,19 @@ namespace OpenRA.Widgets
 					return b;
 				});
 
-                var u = new float2(rect.Left, rect.Top);
+				var u = new float2(rect.Left, rect.Top);
 
-                Game.Renderer.LineRenderer.DrawLine(
-                    u + new float2(10, 10 * k + 5),
-                    u + new float2(12, 10 * k + 5),
-                    item.c, item.c);
+				Game.Renderer.LineRenderer.DrawLine(
+					u + new float2(10, 10 * k + 5),
+					u + new float2(12, 10 * k + 5),
+					item.c, item.c);
 
-                Game.Renderer.LineRenderer.DrawLine(
-                    u + new float2(10, 10 * k + 4),
-                    u + new float2(12, 10 * k + 4),
-                    item.c, item.c);
+				Game.Renderer.LineRenderer.DrawLine(
+					u + new float2(10, 10 * k + 4),
+					u + new float2(12, 10 * k + 4),
+					item.c, item.c);
 
-                ++k;
+				++k;
 			}
 
 			k = 0;

OpenRA.Game/Widgets/ScrollItemWidget.cs

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

OpenRA.Game/Widgets/ShpImageWidget.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Widgets
 		readonly WorldRenderer worldRenderer;
 
 		[ObjectCreator.UseCtor]
-		public ShpImageWidget([ObjectCreator.Param] WorldRenderer worldRenderer)
+		public ShpImageWidget(  WorldRenderer worldRenderer)
 			: base()
 		{
 			GetImage = () => { return Image; };